Merge branch 'master' of http://gitea.czy21-internal.com/czyhome/script

czy21 · Oct 15, 2024 · 3ba6952 · 3ba6952
2 parents 838a959 + 2dc8112
commit 3ba6952
Show file tree

Hide file tree

Showing 4 changed files with 1,891 additions and 812 deletions.
diff --git a/...r/ops/grafana/conf/dashboards/docker.json → ...ops/grafana/conf/dashboards/cadvisor.json b/...r/ops/grafana/conf/dashboards/docker.json → ...ops/grafana/conf/dashboards/cadvisor.json
@@ -293,6 +293,7 @@
             "type": "prometheus",
             "uid": "P047DE0F543C7E359"
           },
+          "editorMode": "code",
           "expr": "count(container_last_seen{name=~\"$name\",instance=~\"$instance\",image!=\"\"}) by (instance)",
           "format": "table",
           "instant": true,
@@ -353,6 +354,7 @@
             "type": "prometheus",
             "uid": "P047DE0F543C7E359"
           },
+          "editorMode": "code",
           "expr": "sum(machine_memory_bytes{instance=~\"$instance\"}) by (instance)",
           "format": "table",
           "instant": true,
@@ -673,7 +675,7 @@
       "description": "",
       "fieldConfig": {
         "defaults": {
-          "custom": {}
+          "links": []
         },
         "overrides": []
       },
@@ -705,11 +707,10 @@
       "linewidth": 2,
       "nullPointMode": "connected",
       "options": {
-        "alertThreshold": true,
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.3.3",
+      "pluginVersion": "9.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -773,7 +774,7 @@
       "description": "",
       "fieldConfig": {
         "defaults": {
-          "custom": {}
+          "links": []
         },
         "overrides": []
       },
@@ -806,11 +807,10 @@
       "linewidth": 2,
       "nullPointMode": "connected",
       "options": {
-        "alertThreshold": true,
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.3.3",
+      "pluginVersion": "9.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -874,7 +874,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "custom": {}
+          "links": []
         },
         "overrides": []
       },
@@ -907,11 +907,10 @@
       "linewidth": 2,
       "nullPointMode": "connected",
       "options": {
-        "alertThreshold": true,
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.3.3",
+      "pluginVersion": "9.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -973,7 +972,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "custom": {}
+          "links": []
         },
         "overrides": []
       },
@@ -1006,11 +1005,10 @@
       "linewidth": 2,
       "nullPointMode": "connected",
       "options": {
-        "alertThreshold": true,
-        "dataLinks": []
+        "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.3.3",
+      "pluginVersion": "9.2.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1067,16 +1065,16 @@
   "schemaVersion": 37,
   "style": "dark",
   "tags": [
-    "docker",
+    "cadvisor",
     "Prometheus"
   ],
   "templating": {
     "list": [
       {
         "current": {
           "selected": false,
-          "text": "cadvisor",
-          "value": "cadvisor"
+          "text": "docker-cadvisor",
+          "value": "docker-cadvisor"
         },
         "datasource": {
           "type": "prometheus",
@@ -1105,29 +1103,33 @@
       {
         "allValue": ".*",
         "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
         },
         "datasource": {
           "type": "prometheus",
           "uid": "P047DE0F543C7E359"
         },
-        "definition": "label_values(container_cpu_user_seconds_total{job=\"$job\"}, name)",
+        "definition": "label_values(container_cpu_user_seconds_total{name=~\"$name\"}, instance)",
         "hide": 0,
         "includeAll": true,
-        "label": "name",
+        "label": "instance",
         "multi": true,
-        "name": "name",
+        "name": "instance",
         "options": [],
         "query": {
-          "query": "label_values(container_cpu_user_seconds_total{job=\"$job\"}, name)",
-          "refId": "nas-name-Variable-Query"
+          "query": "label_values(container_cpu_user_seconds_total{name=~\"$name\"}, instance)",
+          "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 6,
+        "sort": 5,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
@@ -1138,31 +1140,31 @@
         "current": {
           "selected": true,
           "text": [
-            "cadvisor-nas.czy21-internal.com:80"
+            "All"
           ],
           "value": [
-            "cadvisor-nas.czy21-internal.com:80"
+            "$__all"
           ]
         },
         "datasource": {
           "type": "prometheus",
           "uid": "P047DE0F543C7E359"
         },
-        "definition": "label_values(container_cpu_user_seconds_total{name=~\"$name\"}, instance)",
+        "definition": "label_values(container_cpu_user_seconds_total{job=\"$job\"}, name)",
         "hide": 0,
         "includeAll": true,
-        "label": "instance",
+        "label": "name",
         "multi": true,
-        "name": "instance",
+        "name": "name",
         "options": [],
         "query": {
-          "query": "label_values(container_cpu_user_seconds_total{name=~\"$name\"}, instance)",
-          "refId": "nas-instance-Variable-Query"
+          "query": "label_values(container_cpu_user_seconds_total{job=\"$job\"}, name)",
+          "refId": "nas-name-Variable-Query"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 5,
+        "sort": 6,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
@@ -1172,8 +1174,8 @@
         "allValue": ".*",
         "current": {
           "selected": false,
-          "text": "br-59b046961f6c",
-          "value": "br-59b046961f6c"
+          "text": "eth0",
+          "value": "eth0"
         },
         "datasource": {
           "type": "prometheus",
@@ -1202,7 +1204,10 @@
       {
         "allValue": "",
         "current": {
-          "text": "All",
+          "selected": true,
+          "text": [
+            "All"
+          ],
           "value": [
             "$__all"
           ]
@@ -1245,6 +1250,7 @@
           }
         ],
         "query": "unsum,instance,image,container_label_restartcount,device",
+        "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"
       }
@@ -1269,8 +1275,8 @@
     ]
   },
   "timezone": "browser",
-  "title": "docker",
+  "title": "cadvisor",
   "uid": "htoVWdxGt",
-  "version": 1,
+  "version": 9,
   "weekStart": ""
 }