Merge remote-tracking branch 'origin/master'

luechtdiode · Jun 17, 2023 · 483e284 · 483e284
2 parents a8bd336 + 3ef53bb
commit 483e284
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/kutuapp-test/values.yaml b/kutuapp-test/values.yaml
@@ -16,7 +16,7 @@ kutuapp:
   replicaCount: 1
   image:
     repository: luechtdiode/kutuapp
-    tag: bumps-cda50ed
+    tag: fix-client-form-validation-a4ef788
   network:
     metrics:
       servicePort: 3000

diff --git a/kutuapp/templates/grafana-dashboard2-cm.yaml b/kutuapp/templates/grafana-dashboard2-cm.yaml
@@ -132,7 +132,10 @@ data:
           "type": "timeseries"
         },
         {
-          "datasource": {},
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
           "fieldConfig": {
             "defaults": {
               "color": {
@@ -187,7 +190,7 @@ data:
               },
               "exemplar": true,
               "expr": "sum(irate(kutuapp_responses_duration_seconds_sum{path!=\"unlabelled\", status=\"2xx\"}[$__rate_interval])) * 1000 / sum(irate(kutuapp_responses_duration_seconds_count{path!=\"unlabelled\", status=\"2xx\"}[$__rate_interval]))",
-              "hide": true,
+              "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 10,
@@ -728,7 +731,7 @@ data:
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisCenteredZero": false,
+                "axisCenteredZero": true,
                 "axisColorMode": "text",
                 "axisLabel": "",
                 "axisPlacement": "auto",
@@ -790,7 +793,7 @@ data:
                 "mean",
                 "lastNotNull"
               ],
-              "displayMode": "table",
+              "displayMode": "list",
               "placement": "bottom",
               "showLegend": true
             },
@@ -813,8 +816,20 @@ data:
               "instant": false,
               "interval": "",
               "intervalFactor": 2,
-              "legendFormat": "{{pod}}",
+              "legendFormat": "transmitted {{pod}}",
               "refId": "A"
+            },
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "prometheus"
+              },
+              "editorMode": "code",
+              "expr": "sum(rate(container_network_receive_bytes_total[$__rate_interval])*-1) by (pod)",
+              "hide": false,
+              "legendFormat": "received {{pod}}",
+              "range": true,
+              "refId": "B"
             }
           ],
           "title": "Netz-Traffik in Bytes",
@@ -1048,7 +1063,11 @@ data:
       "refresh": "10s",
       "schemaVersion": 37,
       "style": "dark",
-      "tags": [],
+      "tags": [
+        "mk8",
+        "kutuapp",
+        "prod"
+      ],
       "templating": {
         "list": [
           {
@@ -1107,7 +1126,7 @@ data:
       "timezone": "browser",
       "title": "Kutuapp-Graph",
       "uid": "kutuapp2",
-      "version": 1,
+      "version": 3,
       "weekStart": ""
     }
     `}}
diff --git a/kutuapp/values.yaml b/kutuapp/values.yaml
@@ -8,7 +8,7 @@ kutuapp:
   replicaCount: 1
   image:
     repository: luechtdiode/kutuapp
-    tag: bumps-cda50ed
+    tag: v2r2b21-u2
   network:
     metrics:
       servicePort: 3000

diff --git a/setup-microk8s-vm.sh b/setup-microk8s-vm.sh
@@ -29,7 +29,6 @@ sudo microk8s config > .kube/config
 sudo microk8s enable community
 sudo microk8s enable rbac helm3 dns ingress metrics-server storage openebs dashboard
 sudo microk8s status --wait-ready
-sudo microk8s enable dashboard
 sudo microk8s status --wait-ready
 kubectl patch svc kubernetes-dashboard -n kube-system -p '{"spec": {"type": "NodePort"}}'