Skip to content

Commit 10bf15d

Browse files
author
kaiser
committed
Adress DevOps Changes ITISFoundation/osparc-simcore#4453 
1 parent 8c68775 commit 10bf15d

File tree

4 files changed

+26
-45
lines changed

4 files changed

+26
-45
lines changed

‎services/monitoring/grafana/provisioning/osparc.io/dashboards/simcore/s4l-lite-admin-overview.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
"uid": "RmZEr52nz"
384384
},
385385
"editorMode": "code",
386-
"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)",
386+
"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)",
387387
"legendFormat": "__auto",
388388
"range": true,
389389
"refId": "A"

‎services/monitoring/grafana/provisioning/staging.osparc.io/dashboards/simcore/s4l-lite-admin-overview.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,13 @@
383383
"uid": "RmZEr52nz"
384384
},
385385
"editorMode": "code",
386-
"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)",
386+
"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)",
387387
"legendFormat": "__auto",
388388
"range": true,
389389
"refId": "A"
390390
}
391391
],
392-
"title": "Number of s4l-lite studies running (excluding puppeteer from v1.52.0)",
392+
"title": "Number of s4l-lite studies running",
393393
"type": "timeseries"
394394
},
395395
{

‎services/monitoring/grafana/provisioning/tip.itis.swiss/dashboards/simcore/admin-overview.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
"uid": "RmZEr52nz"
181181
},
182182
"editorMode": "code",
183-
"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)",
183+
"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)",
184184
"legendFormat": "__auto",
185185
"range": true,
186186
"refId": "A"
@@ -273,7 +273,7 @@
273273
"uid": "RmZEr52nz"
274274
},
275275
"editorMode": "code",
276-
"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)",
276+
"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)",
277277
"legendFormat": "__auto",
278278
"range": true,
279279
"refId": "A"
@@ -366,7 +366,7 @@
366366
"uid": "RmZEr52nz"
367367
},
368368
"editorMode": "code",
369-
"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)",
369+
"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)",
370370
"legendFormat": "__auto",
371371
"range": true,
372372
"refId": "A"

‎services/monitoring/prometheus/prometheus-base.yml

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -97,48 +97,10 @@ scrape_configs:
9797
# this would require soffisticated regex parsing
9898
# To use these: # KEEP: container_label_simcore_service_settings
9999
#
100-
#- source_labels: [container_label_simcore_service_settings]
101-
# separator: ;
102-
# regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{\"Limits\": (\{".*\})?\{\"NanoCPUs\": )(\d*)([,\}])'
103-
# target_label: docker_service_resources_nanocpu_limit
104-
# replacement: ${4}
105-
# action: replace
106-
#- source_labels: [container_label_simcore_service_settings]
107-
# separator: ;
108-
# regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{\"Limits\": \{)(\{".*\})?(\".*\"\: \d+[,\}] )?(\"MemoryBytes\": )(\d*)([\}])'
109-
# target_label: docker_service_resources_memorybytes_limit
110-
# replacement: ${6}
111-
# action: replace
112-
#- source_labels: [container_label_simcore_service_settings]
113-
# separator: ;
114-
# regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{)("Limits".*, )?(\"Reservations\": (\{".*\})?\{\"NanoCPUs\": )(\d*)([,\}])'
115-
# target_label: docker_service_resources_nanocpu_reservation
116-
# replacement: ${6}
117-
# action: replace
118-
#- source_labels: [container_label_simcore_service_settings]
119-
# separator: ;
120-
# regex: '^\"(.*)?(\"type\": \"Resources\", \"value\": \{)(.*, )?(\"Reservations\": )(\{".*\})?\{(".*": \d+[,\}] )?(\"MemoryBytes\": )(\d*)([,\}])'
121-
# target_label: docker_service_resources_nanocpu_reservation
122-
# replacement: ${8}
123-
# action: replace
124-
#- source_labels: [container_label_simcore_service_settings]
125-
# separator: ;
126-
# regex: '^"(.*)?("GenericResources": \[\{"DiscreteResourceSpec": )(.*)(\{"Kind": "VRAM", "Value": )(\d+)'
127-
# target_label: docker_service_resources_vram_reservation
128-
# replacement: ${5}
129-
# action: replace
130-
#- source_labels: [container_label_simcore_service_settings]
131-
# separator: ;
132-
# regex: '^"(.*)?("GenericResources": \[\{"DiscreteResourceSpec": )(.*)(\{"Kind": "AIRAM", "Value": )(\d+)'
133-
# target_label: docker_service_resources_vram_reservation
134-
# replacement: ${5}
135-
# action: replace
136100
- regex: "container_label_com_docker_compose_config_hash"
137101
action: labeldrop # cAdvisor pruning
138102
- regex: "container_label_com_docker_compose_container_number"
139103
action: labeldrop # cAdvisor pruning
140-
- regex: "container_label_io_simcore_.*"
141-
action: labeldrop # cAdvisor pruning
142104
- regex: "container_label_simcore_service_compose_spec"
143105
action: labeldrop # cAdvisor pruning
144106
- regex: "container_label_simcore_service_container_http_entrypoint"
@@ -157,7 +119,26 @@ scrape_configs:
157119
action: labeldrop # cAdvisor pruning
158120
- regex: "container_label_maintainer"
159121
action: labeldrop # cAdvisor pruning
160-
122+
- regex: "container_label_com_docker_compose_project_working_dir"
123+
action: labeldrop
124+
- regex: "container_label_io_simcore_contact"
125+
action: labeldrop
126+
- regex: "container_label_io_simcore_authors"
127+
action: labeldrop
128+
- regex: "container_label_io_simcore_description"
129+
action: labeldrop
130+
- regex: "container_label_io_simcore_inputs"
131+
action: labeldrop
132+
- regex: "container_label_io_simcore_key"
133+
action: labeldrop
134+
- regex: "container_label_io_simcore_outputs"
135+
action: labeldrop
136+
- regex: "container_label_io_simcore_runtime_swarm_stack_name"
137+
action: labeldrop
138+
- regex: "container_label_io_simcore_thumbnail"
139+
action: labeldrop
140+
- regex: "container_label_simcore_service_settings"
141+
action: labeldrop
161142

162143
### Used:
163144
# container_label_com_docker_swarm_node_id

0 commit comments

Comments
 (0)