Merge pull request 'rc' (#24) from rc into master

Reviewed-on: http://git.enode/deployer3000/integration-module/pulls/23
Reviewed-by: DmitriyA <faleo1999@mail.ru>

Jenkinsfile

@@ -34,7 +34,22 @@ pipeline {
             }
             steps {
                 script {
-                    env.IMAGE_TAG = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim()
+                    def hasTags = sh(script: "git tag -l | wc -l", returnStdout: true).trim().toInteger() > 0
+                        
+                    def lastVersion = "0.0.0"
+                        
+                    if (hasTags) {
+                        lastVersion = sh(script: "git describe --tags --abbrev=0", returnStdout: true).trim()
+                    }
+
+                    echo "Last version: ${lastVersion}"
+
+                    def (major, minor, patch) = lastVersion.tokenize('.')
+                    def newVersion = "${major}.${minor}.${patch.toInteger() + 1}"
+                    echo "New version: ${newVersion}"
+
+                    env.IMAGE_TAG = newVersion
+                    env.NEW_VERSION = newVersion
                 }
             }
         }
@@ -79,18 +94,30 @@ pipeline {
                     echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
+
                         sh """
                         curl -X POST \
                              -u "${GITEA_USER}:${GITEA_PASS}" \
                              -H "Content-Type: application/json" \
                              -d '{"do":"merge"}' \
-                             http://git.entcor/api/v1/repos/deployer3000/integration-module/pulls/${prId}/merge
+                             http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/merge
                         """
+                        def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() // необходим для корректного отображения статусов
                         echo "PR ${prId} merged successfully into master!"
+                        sleep(time: 15, unit: 'SECONDS')
+                        sh "git checkout master && git pull origin master"
+                        
+                        sh """
+                            curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
+                            -H "Content-Type: application/json" \
+                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "master"}' \
+                            "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
+                        """
+                        
+                        echo "New release succeeded!"
 
-                        def context = "test-org/integration-module/pipeline/pr-${env.CHANGE_TARGET}"
+                        def context = "test-org/${env.IMAGE_NAME}/pipeline/pr-${env.CHANGE_TARGET}"
-                        def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
+                        notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, env.IMAGE_NAME, commitHash, "success")
-                        notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, "integration-module", commitHash, "success")
                     }
                 }
             }

crates/api-grub/src/export.rs

@@ -4,7 +4,7 @@ use reqwest::Client;
 use tokio_postgres::NoTls;
 use std::env;
 use anyhow::Result;
-use tracing::{debug, error, info};
+use tracing::{debug, error, info, trace};
 use std::ops::Drop;
 
 /// An entity which handles DB connections.
@@ -113,9 +113,13 @@ impl Exporter {
     }
     /// Exports metrics in `PrometheusMetricsExtended` format to Exporter defined
     /// as env var $EXORPTER_URL 
+    #[tracing::instrument(name = "Prometheus/Status System export")]
     pub async fn export_extended_metrics(metrics: PrometheusMetricsExtended) -> Result<usize> {
         // let url = env::var("EXPORTER_URL")?;
-        let url = env::var("STATUS_SYSTEM_URL").unwrap_or(env::var("EXPORTER_URL")?);
+        let url = env::var("STATUS_SYSTEM_URL").or_else(|err| {
+            trace!("cannot fetch $STATUS_SYSTEM_URL var due to {}. working only with Prometheus exporter link", err);
+            env::var("EXPORTER_URL")
+        })?;
 
         debug!("Exporting: {:?}", &metrics);
 

crates/api-grub/src/monitoring.rs

@@ -277,8 +277,8 @@ impl MonitoringImporter {
             match event.await {
                 Ok(val) => {
                     match crate::export::Exporter::export_extended_metrics(val?).await {
-                        Ok(bytes) => {info!("Successfully transmitted {} bytes to the Prometehus exporter", bytes)},
+                        Ok(bytes) => {info!("Successfully transmitted {} bytes", bytes)},
-                        Err(er) => error!("Cannot export data to the Prometehus exporter due to : `{}`", er),
+                        Err(er) => error!("Cannot export data due to : `{}`", er),
                     }
                 },
                 Err(er) => {