Skip to content

Commit bf1f62d

Browse files
vprashar2929vprashar2929
authored
Merge pull request #1610 from sthaha/scaph-to-dev
chore(compose): add scaphandre to dev compose
2 parents d3c2906 + 4e92b14 commit bf1f62d

File tree

4 files changed

+102
-71
lines changed

4 files changed

+102
-71
lines changed

‎manifests/compose/dev/compose.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,23 @@ services:
6060
- kepler-network
6161
cap_add:
6262
- ALL
63+
64+
scaphandre:
65+
image: hubblo/scaphandre
66+
privileged: true
67+
ports:
68+
- 8880:8080
69+
volumes:
70+
- type: bind
71+
source: /proc
72+
target: /proc
73+
- type: bind
74+
source: /sys/class/powercap
75+
target: /sys/class/powercap
76+
command: [prometheus]
77+
networks:
78+
- scaph-network
79+
80+
networks:
81+
scaph-network:
82+
kepler-network:

‎manifests/compose/dev/grafana/dashboards/dev/dashboard.json

+75-71
Original file line numberDiff line numberDiff line change
@@ -5225,26 +5225,16 @@
52255225
]
52265226
},
52275227
{
5228-
"__systemRef": "hideSeriesFrom",
52295228
"matcher": {
5230-
"id": "byNames",
5231-
"options": {
5232-
"mode": "exclude",
5233-
"names": [
5234-
"dev: dynamic",
5235-
"dev: idle"
5236-
],
5237-
"prefix": "All except:",
5238-
"readOnly": true
5239-
}
5229+
"id": "byRegexp",
5230+
"options": "/scaph.*/"
52405231
},
52415232
"properties": [
52425233
{
5243-
"id": "custom.hideFrom",
5234+
"id": "color",
52445235
"value": {
5245-
"legend": false,
5246-
"tooltip": false,
5247-
"viz": true
5236+
"fixedColor": "semi-dark-purple",
5237+
"mode": "fixed"
52485238
}
52495239
}
52505240
]
@@ -5285,6 +5275,19 @@
52855275
"legendFormat": "{{job}}: {{mode}}",
52865276
"range": true,
52875277
"refId": "A"
5278+
},
5279+
{
5280+
"datasource": {
5281+
"type": "prometheus",
5282+
"uid": "PDE6745920139CE56"
5283+
},
5284+
"editorMode": "code",
5285+
"expr": "scaph_process_power_consumption_microwatts{pid=\"${process}\"} / 10^6\n",
5286+
"hide": false,
5287+
"instant": false,
5288+
"legendFormat": "scaph - {{pid}}",
5289+
"range": true,
5290+
"refId": "B"
52885291
}
52895292
],
52905293
"type": "timeseries"
@@ -5944,7 +5947,32 @@
59445947
]
59455948
}
59465949
},
5947-
"overrides": []
5950+
"overrides": [
5951+
{
5952+
"__systemRef": "hideSeriesFrom",
5953+
"matcher": {
5954+
"id": "byNames",
5955+
"options": {
5956+
"mode": "exclude",
5957+
"names": [
5958+
"dynamic"
5959+
],
5960+
"prefix": "All except:",
5961+
"readOnly": true
5962+
}
5963+
},
5964+
"properties": [
5965+
{
5966+
"id": "custom.hideFrom",
5967+
"value": {
5968+
"legend": false,
5969+
"tooltip": false,
5970+
"viz": true
5971+
}
5972+
}
5973+
]
5974+
}
5975+
]
59485976
},
59495977
"gridPos": {
59505978
"h": 5,
@@ -6163,6 +6191,19 @@
61636191
"legendFormat": "{{job}}: {{mode}}",
61646192
"range": true,
61656193
"refId": "A"
6194+
},
6195+
{
6196+
"datasource": {
6197+
"type": "prometheus",
6198+
"uid": "PDE6745920139CE56"
6199+
},
6200+
"editorMode": "code",
6201+
"expr": "scaph_process_power_consumption_microwatts{pid=\"${process}\"} / 10^6\n",
6202+
"hide": false,
6203+
"instant": false,
6204+
"legendFormat": "scaph - {{pid}}",
6205+
"range": true,
6206+
"refId": "B"
61666207
}
61676208
],
61686209
"type": "timeseries"
@@ -6473,8 +6514,7 @@
64736514
"mode": "absolute",
64746515
"steps": [
64756516
{
6476-
"color": "green",
6477-
"value": null
6517+
"color": "green"
64786518
}
64796519
]
64806520
},
@@ -6654,8 +6694,7 @@
66546694
"mode": "absolute",
66556695
"steps": [
66566696
{
6657-
"color": "green",
6658-
"value": null
6697+
"color": "green"
66596698
},
66606699
{
66616700
"color": "red",
@@ -6784,8 +6823,7 @@
67846823
"mode": "absolute",
67856824
"steps": [
67866825
{
6787-
"color": "dark-red",
6788-
"value": null
6826+
"color": "dark-red"
67896827
},
67906828
{
67916829
"color": "semi-dark-red",
@@ -6912,8 +6950,7 @@
69126950
"mode": "absolute",
69136951
"steps": [
69146952
{
6915-
"color": "green",
6916-
"value": null
6953+
"color": "green"
69176954
},
69186955
{
69196956
"color": "red",
@@ -6952,30 +6989,6 @@
69526989
}
69536990
}
69546991
]
6955-
},
6956-
{
6957-
"__systemRef": "hideSeriesFrom",
6958-
"matcher": {
6959-
"id": "byNames",
6960-
"options": {
6961-
"mode": "exclude",
6962-
"names": [
6963-
"dev - bpf"
6964-
],
6965-
"prefix": "All except:",
6966-
"readOnly": true
6967-
}
6968-
},
6969-
"properties": [
6970-
{
6971-
"id": "custom.hideFrom",
6972-
"value": {
6973-
"legend": false,
6974-
"tooltip": false,
6975-
"viz": true
6976-
}
6977-
}
6978-
]
69796992
}
69806993
]
69816994
},
@@ -7064,8 +7077,7 @@
70647077
"mode": "absolute",
70657078
"steps": [
70667079
{
7067-
"color": "green",
7068-
"value": null
7080+
"color": "green"
70697081
},
70707082
{
70717083
"color": "red",
@@ -7178,8 +7190,7 @@
71787190
"mode": "absolute",
71797191
"steps": [
71807192
{
7181-
"color": "dark-red",
7182-
"value": null
7193+
"color": "dark-red"
71837194
},
71847195
{
71857196
"color": "semi-dark-red",
@@ -7306,8 +7317,7 @@
73067317
"mode": "absolute",
73077318
"steps": [
73087319
{
7309-
"color": "green",
7310-
"value": null
7320+
"color": "green"
73117321
},
73127322
{
73137323
"color": "red",
@@ -7458,8 +7468,7 @@
74587468
"mode": "absolute",
74597469
"steps": [
74607470
{
7461-
"color": "green",
7462-
"value": null
7471+
"color": "green"
74637472
},
74647473
{
74657474
"color": "red",
@@ -7572,8 +7581,7 @@
75727581
"mode": "absolute",
75737582
"steps": [
75747583
{
7575-
"color": "dark-red",
7576-
"value": null
7584+
"color": "dark-red"
75777585
},
75787586
{
75797587
"color": "semi-dark-red",
@@ -7700,8 +7708,7 @@
77007708
"mode": "absolute",
77017709
"steps": [
77027710
{
7703-
"color": "green",
7704-
"value": null
7711+
"color": "green"
77057712
},
77067713
{
77077714
"color": "red",
@@ -7852,8 +7859,7 @@
78527859
"mode": "absolute",
78537860
"steps": [
78547861
{
7855-
"color": "green",
7856-
"value": null
7862+
"color": "green"
78577863
},
78587864
{
78597865
"color": "red",
@@ -7966,8 +7972,7 @@
79667972
"mode": "absolute",
79677973
"steps": [
79687974
{
7969-
"color": "dark-red",
7970-
"value": null
7975+
"color": "dark-red"
79717976
},
79727977
{
79737978
"color": "semi-dark-red",
@@ -8094,8 +8099,7 @@
80948099
"mode": "absolute",
80958100
"steps": [
80968101
{
8097-
"color": "green",
8098-
"value": null
8102+
"color": "green"
80998103
},
81008104
{
81018105
"color": "red",
@@ -8246,8 +8250,7 @@
82468250
"mode": "absolute",
82478251
"steps": [
82488252
{
8249-
"color": "green",
8250-
"value": null
8253+
"color": "green"
82518254
},
82528255
{
82538256
"color": "red",
@@ -8312,6 +8315,7 @@
83128315
"type": "timeseries"
83138316
}
83148317
],
8318+
"refresh": "",
83158319
"schemaVersion": 39,
83168320
"tags": [],
83178321
"templating": {
@@ -8341,13 +8345,13 @@
83418345
]
83428346
},
83438347
"time": {
8344-
"from": "now-15m",
8348+
"from": "now-5m",
83458349
"to": "now"
83468350
},
83478351
"timepicker": {},
83488352
"timezone": "browser",
83498353
"title": "Latest vs Development",
8350-
"uid": "cdlr930lbpjwge",
8351-
"version": 9,
8354+
"uid": "ddr7l8fdlgw74c",
8355+
"version": 2,
83528356
"weekStart": ""
83538357
}

‎manifests/compose/dev/override.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ services:
1313
- type: bind
1414
source: ./dev/prometheus/scrape-configs/dev.yaml
1515
target: /etc/prometheus/scrape-configs/dev.yaml
16+
17+
networks:
18+
- scaph-network

‎manifests/compose/dev/prometheus/scrape-configs/dev.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ scrape_configs:
22
- job_name: dev
33
static_configs:
44
- targets: [kepler-dev:8888]
5+
6+
- job_name: scaphandre
7+
static_configs:
8+
- targets: [scaphandre:8080]

0 commit comments

Comments
 (0)