Merge pull request #159 from microservices-suite/repo-engineering/deletion_automation

feat: add suite signature to ELK

Author: GAndanje

.suite-cli/cli/scripts/assets/grafanaKrakendDashboardJsonContent.asset.js

@@ -1,4 +1,4 @@
-module.exports = () =>`
+module.exports = ({ app_name }) => `
 {
   "annotations": {
     "list": [
@@ -6970,7 +6970,7 @@ module.exports = () =>`
     ]
   },
   "timezone": "",
-  "title": "KrakenD",
+  "title": "🦧${app_name}",
   "uid": "I9FkyxWik",
   "version": 1
 }`

.suite-cli/cli/scripts/assets/krakenJsonContent.asset.js

@@ -4,7 +4,8 @@ module.exports = ({
   api_version,
   gateway_cache_period,
   gateway_timeout,
-  gateway_port
+  gateway_port,
+  app_name
 }) => {
   // Health check for all services
   const suiteStatusCheckBackends = services.map((service) => `
@@ -79,7 +80,7 @@ module.exports = ({
     },
     "telemetry/logging": {
         "level": "DEBUG",
-        "prefix": "[KRAKEND]",
+        "prefix": "[SUITE]",
         "syslog": false,
         "stdout": true
     },
@@ -97,7 +98,7 @@ module.exports = ({
         "exporters": {
             "jaeger": {
                 "endpoint": "http://jaeger:14268/api/traces",
-                "service_name": "krakend"
+                "service_name": "🦧${app_name}"
             }
         }
     }

.suite-cli/cli/scripts/assets/krakendConfigContent.asset.js

@@ -4,7 +4,8 @@ module.exports = ({
   api_version,
   gateway_cache_period,
   gateway_timeout,
-  gateway_port
+  gateway_port,
+  app_name
 }) => {
   // Health check for all services
   const suiteStatusCheckBackends = services.map((service) => `
@@ -79,7 +80,7 @@ module.exports = ({
     },
     "telemetry/logging": {
         "level": "DEBUG",
-        "prefix": "[KRAKEND]",
+        "prefix": "[SUITE]",
         "syslog": false,
         "stdout": true
     },
@@ -97,7 +98,7 @@ module.exports = ({
         "exporters": {
             "jaeger": {
                 "endpoint": "http://jaeger:14268/api/traces",
-                "service_name": "krakend"
+                "service_name": "🦧${app_name}"
             }
         }
     }

.suite-cli/cli/scripts/assets/krakendPartialsExtraConfContent.asset.js

@@ -1,4 +1,4 @@
-module.exports = () =>`
+module.exports = ({ app_name }) => `
 {
     "security/cors": {
       "allow_origins": [
@@ -23,7 +23,7 @@ module.exports = () =>`
     },
     "telemetry/logging": {
       "level": "DEBUG",
-      "prefix": "[KRAKEND]",
+      "prefix": "[SUITE]",
       "syslog": false,
       "stdout": true
     },
@@ -48,7 +48,7 @@ module.exports = () =>`
       "exporters": {
         "jaeger": {
           "endpoint": "http://jaeger:14268/api/traces",
-          "serviceName": "krakend"
+          "serviceName": "🦧${app_name}"
         }
       }
     }

.suite-cli/cli/scripts/assets/logstashConfContent.asset.js

@@ -8,10 +8,10 @@ input {
 filter {
     # Grok expression matches several formats (EE and CE):
     #[GIN] 2022/09/09 - 08:33:51 | 200 |     732.753µs |      172.20.0.1 | GET      "/sequential"
-    #[KRAKEND] 2022/09/09 - 08:35:25.813 [AccessLog] | 200 | 92.944122ms |      172.20.0.1 | GET      /market/simple
-    #[KRAKEND][SERVICE: AsyncAgent][AMQP][async-agent-demo] Starting the consumer
+    #[SUITE] 2022/09/09 - 08:35:25.813 [AccessLog] | 200 | 92.944122ms |      172.20.0.1 | GET      /market/simple
+    #[SUITE][SERVICE: AsyncAgent][AMQP][async-agent-demo] Starting the consumer
     grok {
-        match => { "message" => '(\[%{WORD}\] %{DATA}%{SPACE}-%{SPACE}%{DATA}%{SPACE}(\[AccessLog\]%{SPACE})?\| %{NUMBER:statusCode} \|%{SPACE}%{NUMBER:duration}(m|µ|n|u)?s%{SPACE}\|%{SPACE}%{DATA:ip}%{SPACE}\|%{SPACE}%{WORD:verb}%{SPACE}"?(?<url>[^"]+)"?)?((\[KRAKEND\])?\[%{WORD:scope}(: (?<context>[^\]]+)(\]\[%{DATA:sublevel1})?(\]\[%{DATA:sublevel2})?)?\] %{GREEDYDATA:msg})?'}
+        match => { "message" => '(\[%{WORD}\] %{DATA}%{SPACE}-%{SPACE}%{DATA}%{SPACE}(\[AccessLog\]%{SPACE})?\| %{NUMBER:statusCode} \|%{SPACE}%{NUMBER:duration}(m|µ|n|u)?s%{SPACE}\|%{SPACE}%{DATA:ip}%{SPACE}\|%{SPACE}%{WORD:verb}%{SPACE}"?(?<url>[^"]+)"?)?((\[SUITE\])?\[%{WORD:scope}(: (?<context>[^\]]+)(\]\[%{DATA:sublevel1})?(\]\[%{DATA:sublevel2})?)?\] %{GREEDYDATA:msg})?'}
     }
 
     if [host] and ![host][name] {

.suite-cli/cli/scripts/krakend.ndjson

@@ -1550,11 +1550,11 @@ const injectSREConfigs = async ({ app_directory, answers, relativeKrakendDir, kr
                     break;
 
                 case 'grafana/krakend':
-                    writeFile(join(current_dir, 'dashboard.json'), assets.grafanaKrakendDashboardJsonContent());
+                    writeFile(join(current_dir, 'dashboard.json'), assets.grafanaKrakendDashboardJsonContent({ app_name: answers.app_name }));
                     break;
 
                 case 'krakend/partials':
-                    writeFile(join(current_dir, 'extra_config.tmpl'), assets.krakendPartialsExtraConfContent());
+                    writeFile(join(current_dir, 'extra_config.tmpl'), assets.krakendPartialsExtraConfContent({app_name: answers.app_name}));
                     writeFile(join(current_dir, 'input_headers.tmpl'), assets.krakendPartialsInputHeadersContent());
                     writeFile(join(current_dir, 'rate_limit_backend.tmpl'), assets.krakendPartialsRateLimitBackendContent());
                     break;
@@ -1588,10 +1588,11 @@ const injectSREConfigs = async ({ app_directory, answers, relativeKrakendDir, kr
         api_version: answers.api_version,
         gateway_cache_period: answers.gateway_cache_period,
         gateway_timeout: answers.gateway_timeout,
-        relativeKrakendDir
+        relativeKrakendDir,
+        app_name: answers.app_name
     }));
     writeFile(join(`${app_directory}`, '.env'), assets.dockerComposeEnvContent());
-    await downloadAndWriteDashboardFile(app_directory);
+    await readAndWriteDashboardFile(app_directory, answers);
 
 }
 const scaffoldApp = ({ answers }) => {
@@ -2146,30 +2147,19 @@ const removeGateway = async ({ gateway, project_root }) => {
     }
 };
 
-const downloadAndWriteDashboardFile = (app_directory) => {
-    const fileUrl = 'https://raw.githubusercontent.com/krakend/playground-community/master/config/elastic/dashboard.ndjson';
+const readAndWriteDashboardFile = (app_directory, answers) => {
     const outputDirectory = path.join(app_directory, 'telemetry', 'elastic');
     const filename = 'dashboard.ndjson';
     const outputPath = path.join(outputDirectory, filename);
+    // Read the NDJSON file content as a string
+    console.log({__dirname:__dirname})
+    const krakendNdjson = readFileSync(`${__dirname}/krakend.ndjson`, 'utf8');
 
-    return new Promise((resolve, reject) => {
-        const file = fs.createWriteStream(outputPath);
-
-        https.get(fileUrl, (response) => {
-            if (response.statusCode === 200) {
-                response.pipe(file);
-                file.on('finish', () => {
-                    file.close(() => {
-                        resolve();
-                    });
-                });
-            } else {
-                reject(new Error(`Failed to download file: ${response.statusCode} ${response.statusMessage}`));
-            }
-        }).on('error', (err) => {
-            fs.unlink(outputPath, () => reject(err));
-        });
-    });
+    // Replace all occurrences of 'KrakenD' with 'SuiteCLI/<appname>'
+    const updatedContent = krakendNdjson.replace(/KrakenD/g, `🦧${answers.app_name}`);
+
+    // Write the updated content to the new file
+    writeFileSync(outputPath, updatedContent);
 };
 
 module.exports = {