Merge pull request #413 from snetsystems/dev-1.4.0-hajaegeun

Added the default option for collecting into the telegraf config for OSP
snetsystems · Jun 29, 2023 · 1fdef1b · 1fdef1b
2 parents a0aaa63 + f5f743e
commit 1fdef1b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 15 deletions.
diff --git a/backend/canned/openstack.json b/backend/canned/openstack.json
@@ -15,8 +15,8 @@
       "name": "CPU Usage",
       "queries": [
         {
-          "query": "SELECT non_negative_derivative(mean(\"cpu0_time\")) AS \"mean_cpu0_time\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\"",
-          "label": "",
+          "query": "SELECT non_negative_derivative(mean(\"cpu_time\"), 1s) / 10000000 AS \"cpu_percent\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\"",
+          "label": "CPU Usage",
           "groupbys": [],
           "wheres": []
         }
@@ -32,7 +32,7 @@
         },
         "y": {
           "bounds": ["", ""],
-          "label": "",
+          "label": "CPU Usage",
           "prefix": "",
           "suffix": "",
           "base": "10",
@@ -57,10 +57,10 @@
       "h": 30,
       "minW": 10,
       "minH": 4,
-      "name": "Port Recevie Packet",
+      "name": "Port Recevie",
       "queries": [
         {
-          "query": "SELECT mean(\"port_rx_packets\") AS \"mean_port_rx_packets\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\"",
+          "query": "SELECT non_negative_derivative(mean(\"port_rx\")) AS \"port_rx\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\"",
           "label": "",
           "groupbys": [],
           "wheres": []
@@ -77,7 +77,7 @@
         },
         "y": {
           "bounds": ["", ""],
-          "label": "port_rx_packets",
+          "label": "Port Recevie",
           "prefix": "",
           "suffix": "",
           "base": "10",
@@ -102,12 +102,22 @@
       "h": 12,
       "minW": 10,
       "minH": 4,
-      "name": "Port Transmit Packets",
+      "name": "Port Transmit",
       "queries": [
         {
-          "query": "SELECT non_negative_derivative(max(\"port_tx_packets\")) AS \"mean_port_tx_packets\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\""
+          "query": "SELECT non_negative_derivative(mean(\"port_tx\")) AS \"mean_port_tx\" FROM \":db:\".\":rp:\".\"openstack_server_diagnostics\""
         }
-      ]
+      ],
+      "axes": {
+        "y": {
+          "bounds": ["", ""],
+          "label": "Port Transmit",
+          "prefix": "",
+          "suffix": "",
+          "base": "10",
+          "scale": "linear"
+        }
+      }
     },
 
     {
@@ -163,7 +173,7 @@
         },
         "y": {
           "bounds": ["", ""],
-          "label": "",
+          "label": "Memory Used",
           "prefix": "",
           "suffix": "",
           "base": "2",
@@ -215,7 +225,16 @@
           "wheres": []
         }
       ],
-
+      "axes": {
+        "y": {
+          "bounds": ["", ""],
+          "label": "Disk Read Request",
+          "prefix": "",
+          "suffix": "",
+          "base": "2",
+          "scale": "linear"
+        }
+      },
       "type": "line"
     },
     {
@@ -235,7 +254,16 @@
           "wheres": []
         }
       ],
-
+      "axes": {
+        "y": {
+          "bounds": ["", ""],
+          "label": "Disk Write Request",
+          "prefix": "",
+          "suffix": "",
+          "base": "2",
+          "scale": "linear"
+        }
+      },
       "type": "line"
     }
   ]

diff --git a/backend/server/csp.go b/backend/server/csp.go
@@ -476,7 +476,7 @@ func (s *Service) generateTelegrafConfigForOSP(ctx context.Context, csp *cloudhu
 				{
 					Interval:               "2m",
 					AuthenticationEndpoint: s.OSP.AuthURL,
-					EnabledServices:        []string{"servers", "flavors"},
+					EnabledServices:        []string{"projects", "servers", "flavors", "networks", "ports", "storage_pools", "subnets", "volumes", "compute_quotas", "network_quotas", "volume_quotas"},
 					Domain:                 s.OSP.UserDomain,
 					Project:                csp.NameSpace,
 					Username:               s.OSP.AdminUser,

diff --git a/frontend/src/agent_admin/constants/CollectorConfigTable.ts b/frontend/src/agent_admin/constants/CollectorConfigTable.ts
@@ -63,10 +63,12 @@ export const COLLECTOR_DROPDOWN_DATA = [
   'projects',
   'servers',
   'services',
-  'stacks',
   'storage_pools',
   'subnets',
   'volumes',
+  'compute_quotas',
+  'network_quotas',
+  'volume_quotas',
 ]
 
 export const COLLECTOR_CONFIG_TAB_ABBREVIATION = {

diff --git a/frontend/src/agent_admin/containers/ServiceConfig.tsx b/frontend/src/agent_admin/containers/ServiceConfig.tsx
@@ -487,7 +487,10 @@ export class ServiceConfig extends PureComponent<Props, State> {
 
             getRunLocalServiceDebugTelegraf
               .then(({data}): void => {
-                const isTestFailed = data.indexOf('E!') !== -1 ? true : false
+                const isTestFailed =
+                  data.includes('E!') || data.includes('runtime error')
+                    ? true
+                    : false
 
                 if (isTestFailed) {
                   const errorMessage = data.split('[telegraf]')[1]