Adress DevOps Changes ITISFoundation/osparc-simcore#4453

mrnicegyu11 · Aug 22, 2023 · 10bf15d · 10bf15d
1 parent 8c68775
commit 10bf15d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 45 deletions.
diff --git a/...monitoring/grafana/provisioning/osparc.io/dashboards/simcore/s4l-lite-admin-overview.json b/...monitoring/grafana/provisioning/osparc.io/dashboards/simcore/s4l-lite-admin-overview.json
@@ -383,7 +383,7 @@
               "uid": "RmZEr52nz"
             },
             "editorMode": "code",
-            "expr": "count(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_simcore_user_agent!=\"puppeteer\"}),0)",
+            "expr": "count(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}),0)",
             "legendFormat": "__auto",
             "range": true,
             "refId": "A"

diff --git a/...ng/grafana/provisioning/staging.osparc.io/dashboards/simcore/s4l-lite-admin-overview.json b/...ng/grafana/provisioning/staging.osparc.io/dashboards/simcore/s4l-lite-admin-overview.json
@@ -383,13 +383,13 @@
               "uid": "RmZEr52nz"
             },
             "editorMode": "code",
-            "expr": "count(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_simcore_user_agent!=\"puppeteer\"}),0)",
+            "expr": "count(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*[.osparc.io].*/simcore/services/dynamic/s4l-core-lite.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}),0)",
             "legendFormat": "__auto",
             "range": true,
             "refId": "A"
           }
         ],
-        "title": "Number of s4l-lite studies running (excluding puppeteer from v1.52.0)",
+        "title": "Number of s4l-lite studies running",
         "type": "timeseries"
       },
       {

diff --git a/...ces/monitoring/grafana/provisioning/tip.itis.swiss/dashboards/simcore/admin-overview.json b/...ces/monitoring/grafana/provisioning/tip.itis.swiss/dashboards/simcore/admin-overview.json
@@ -180,7 +180,7 @@
               "uid": "RmZEr52nz"
             },
             "editorMode": "code",
-            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/electrode-selector.*$\",container_label_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/electrode-selector.*$\",container_label_simcore_user_agent!=\"puppeteer\"}),0)",
+            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/electrode-selector.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/electrode-selector.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}),0)",
             "legendFormat": "__auto",
             "range": true,
             "refId": "A"
@@ -273,7 +273,7 @@
               "uid": "RmZEr52nz"
             },
             "editorMode": "code",
-            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/sim4life-postpro.*$\",container_label_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/sim4life-postpro.*$\",container_label_simcore_user_agent!=\"puppeteer\"}),0)",
+            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/sim4life-postpro.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/sim4life-postpro.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}),0)",
             "legendFormat": "__auto",
             "range": true,
             "refId": "A"
@@ -366,7 +366,7 @@
               "uid": "RmZEr52nz"
             },
             "editorMode": "code",
-            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/ti-postpro.*$\",container_label_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/ti-postpro.*$\",container_label_simcore_user_agent!=\"puppeteer\"}),0)",
+            "expr": "count(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/ti-postpro.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}) OR clamp_max(absent(container_memory_usage_bytes{image=~\"^.*/simcore/services/dynamic/ti-postpro.*$\",container_label_io_simcore_runtime_simcore_user_agent!=\"puppeteer\"}),0)",
             "legendFormat": "__auto",
             "range": true,
             "refId": "A"

diff --git a/services/monitoring/prometheus/prometheus-base.yml b/services/monitoring/prometheus/prometheus-base.yml
@@ -97,48 +97,10 @@ scrape_configs:
       # this would require soffisticated regex parsing
       # To use these: # KEEP: container_label_simcore_service_settings
       #
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{\"Limits\": (\{".*\})?\{\"NanoCPUs\": )(\d*)([,\}])'
-      #  target_label: docker_service_resources_nanocpu_limit
-      #  replacement: ${4}
-      #  action: replace
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{\"Limits\": \{)(\{".*\})?(\".*\"\: \d+[,\}] )?(\"MemoryBytes\": )(\d*)([\}])'
-      #  target_label: docker_service_resources_memorybytes_limit
-      #  replacement: ${6}
-      #  action: replace
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{)("Limits".*, )?(\"Reservations\": (\{".*\})?\{\"NanoCPUs\": )(\d*)([,\}])'
-      #  target_label: docker_service_resources_nanocpu_reservation
-      #  replacement: ${6}
-      #  action: replace
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{)(.*, )?(\"Reservations\": )(\{".*\})?\{(".*": \d+[,\}] )?(\"MemoryBytes\": )(\d*)([,\}])'
-      #  target_label: docker_service_resources_nanocpu_reservation
-      #  replacement: ${8}
-      #  action: replace
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^"(.*)?("GenericResources": \[\{"DiscreteResourceSpec": )(.*)(\{"Kind": "VRAM", "Value": )(\d+)'
-      #  target_label: docker_service_resources_vram_reservation
-      #  replacement: ${5}
-      #  action: replace
-      #- source_labels: [container_label_simcore_service_settings]
-      #  separator: ;
-      #  regex: '^"(.*)?("GenericResources": \[\{"DiscreteResourceSpec": )(.*)(\{"Kind": "AIRAM", "Value": )(\d+)'
-      #  target_label: docker_service_resources_vram_reservation
-      #  replacement: ${5}
-      #  action: replace
       - regex: "container_label_com_docker_compose_config_hash"
         action: labeldrop  # cAdvisor pruning
       - regex: "container_label_com_docker_compose_container_number"
         action: labeldrop  # cAdvisor pruning
-      - regex: "container_label_io_simcore_.*"
-        action: labeldrop  # cAdvisor pruning
       - regex: "container_label_simcore_service_compose_spec"
         action: labeldrop  # cAdvisor pruning
       - regex: "container_label_simcore_service_container_http_entrypoint"
@@ -157,7 +119,26 @@ scrape_configs:
         action: labeldrop  # cAdvisor pruning
       - regex: "container_label_maintainer"
         action: labeldrop  # cAdvisor pruning
-
+      - regex: "container_label_com_docker_compose_project_working_dir"
+        action: labeldrop
+      - regex: "container_label_io_simcore_contact"
+        action: labeldrop
+      - regex: "container_label_io_simcore_authors"
+        action: labeldrop
+      - regex: "container_label_io_simcore_description"
+        action: labeldrop
+      - regex: "container_label_io_simcore_inputs"
+        action: labeldrop
+      - regex: "container_label_io_simcore_key"
+        action: labeldrop
+      - regex: "container_label_io_simcore_outputs"
+        action: labeldrop
+      - regex: "container_label_io_simcore_runtime_swarm_stack_name"
+        action: labeldrop
+      - regex: "container_label_io_simcore_thumbnail"
+        action: labeldrop
+      - regex: "container_label_simcore_service_settings"
+        action: labeldrop
 
 ### Used:
 # container_label_com_docker_swarm_node_id