Skip to content

Commit 98a81a9

Browse files
d-hpd-hp
committed
Rebuilt all images using buildx command for publication on docker hub & performed further testing to ensure functionality
1 parent 9ccfa70 commit 98a81a9

File tree

5 files changed

+78
-21
lines changed

5 files changed

+78
-21
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ EXPOSE 4000
2525

2626
# Start the app
2727
CMD ["npm", "start"]
28+
29+

‎docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ services:
2525
- /var/run/docker.sock:/var/run/docker.sock:rw
2626
- /sys:/sys:ro
2727
- /var/lib/docker/:/var/lib/docker:ro
28+
- /etc/machine-id:/etc/machine-id:ro
2829

2930
labels:
3031
org_prometheus_starter: 'true'

‎imageConfigs/grafana/provisioning/dashboards/dashboard.json‎

Lines changed: 69 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"content": "<h1>CPU<h1>",
7676
"mode": "html"
7777
},
78-
"pluginVersion": "9.3.6",
78+
"pluginVersion": "9.4.1",
7979
"targets": [
8080
{
8181
"datasource": {
@@ -150,7 +150,7 @@
150150
"text": {},
151151
"textMode": "auto"
152152
},
153-
"pluginVersion": "9.3.6",
153+
"pluginVersion": "9.4.1",
154154
"targets": [
155155
{
156156
"datasource": {
@@ -224,7 +224,7 @@
224224
"text": {},
225225
"textMode": "auto"
226226
},
227-
"pluginVersion": "9.3.6",
227+
"pluginVersion": "9.4.1",
228228
"targets": [
229229
{
230230
"datasource": {
@@ -302,7 +302,7 @@
302302
"text": {},
303303
"textMode": "auto"
304304
},
305-
"pluginVersion": "9.3.6",
305+
"pluginVersion": "9.4.1",
306306
"targets": [
307307
{
308308
"datasource": {
@@ -322,6 +322,58 @@
322322
"transparent": true,
323323
"type": "stat"
324324
},
325+
{
326+
"datasource": {
327+
"type": "prometheus",
328+
"uid": "PBFA97CFB590B2093"
329+
},
330+
"description": "",
331+
"gridPos": {
332+
"h": 1,
333+
"w": 1,
334+
"x": 23,
335+
"y": 3
336+
},
337+
"id": 77,
338+
"options": {
339+
"activeTheme": "Transparent",
340+
"disableThemePicker": true,
341+
"themes": [
342+
{
343+
"name": "Transparent",
344+
"styles": [
345+
{
346+
"props": {
347+
"theme": "default"
348+
},
349+
"type": "basetheme"
350+
},
351+
{
352+
"props": {
353+
"url": ""
354+
},
355+
"type": "bgimage"
356+
},
357+
{
358+
"props": {
359+
"url": ""
360+
},
361+
"type": "url"
362+
},
363+
{
364+
"props": {
365+
"text": "body, .panel-container, .dashboard-container, main { background-color: rgba(0,0,0,0)!important; }"
366+
},
367+
"type": "style"
368+
}
369+
]
370+
}
371+
]
372+
},
373+
"pluginVersion": "0.2.1",
374+
"transparent": true,
375+
"type": "yesoreyeram-boomtheme-panel"
376+
},
325377
{
326378
"datasource": {
327379
"type": "prometheus",
@@ -374,7 +426,7 @@
374426
"text": {},
375427
"textMode": "auto"
376428
},
377-
"pluginVersion": "9.3.6",
429+
"pluginVersion": "9.4.1",
378430
"targets": [
379431
{
380432
"datasource": {
@@ -437,7 +489,7 @@
437489
"content": "<h1>Memory<h1>",
438490
"mode": "html"
439491
},
440-
"pluginVersion": "9.3.6",
492+
"pluginVersion": "9.4.1",
441493
"targets": [
442494
{
443495
"datasource": {
@@ -498,7 +550,7 @@
498550
"text": {},
499551
"textMode": "auto"
500552
},
501-
"pluginVersion": "9.3.6",
553+
"pluginVersion": "9.4.1",
502554
"targets": [
503555
{
504556
"datasource": {
@@ -774,7 +826,7 @@
774826
"text": {},
775827
"textMode": "auto"
776828
},
777-
"pluginVersion": "9.3.6",
829+
"pluginVersion": "9.4.1",
778830
"targets": [
779831
{
780832
"datasource": {
@@ -945,7 +997,7 @@
945997
"text": {},
946998
"textMode": "auto"
947999
},
948-
"pluginVersion": "9.3.6",
1000+
"pluginVersion": "9.4.1",
9491001
"targets": [
9501002
{
9511003
"datasource": {
@@ -1033,8 +1085,7 @@
10331085
"mode": "absolute",
10341086
"steps": [
10351087
{
1036-
"color": "rgb(128, 128, 128)",
1037-
"value": null
1088+
"color": "rgb(128, 128, 128)"
10381089
},
10391090
{
10401091
"color": "dark-green",
@@ -1129,8 +1180,7 @@
11291180
"mode": "absolute",
11301181
"steps": [
11311182
{
1132-
"color": "green",
1133-
"value": null
1183+
"color": "green"
11341184
},
11351185
{
11361186
"color": "red",
@@ -1305,8 +1355,7 @@
13051355
"mode": "absolute",
13061356
"steps": [
13071357
{
1308-
"color": "purple",
1309-
"value": null
1358+
"color": "purple"
13101359
}
13111360
]
13121361
},
@@ -1499,8 +1548,7 @@
14991548
"mode": "absolute",
15001549
"steps": [
15011550
{
1502-
"color": "rgb(128, 128, 128)",
1503-
"value": null
1551+
"color": "rgb(128, 128, 128)"
15041552
},
15051553
{
15061554
"color": "dark-purple",
@@ -1561,8 +1609,7 @@
15611609
"mode": "absolute",
15621610
"steps": [
15631611
{
1564-
"color": "rgb(128, 128, 128)",
1565-
"value": null
1612+
"color": "rgb(128, 128, 128)"
15661613
},
15671614
{
15681615
"color": "dark-purple",
@@ -1612,7 +1659,8 @@
16121659
}
16131660
],
16141661
"refresh": "30s",
1615-
"schemaVersion": 37,
1662+
"revision": 1,
1663+
"schemaVersion": 38,
16161664
"style": "dark",
16171665
"tags": ["system"],
16181666
"templating": {
@@ -1648,6 +1696,6 @@
16481696
"timezone": "browser",
16491697
"title": "System",
16501698
"uid": "h5LcytHGz",
1651-
"version": 2,
1699+
"version": 1,
16521700
"weekStart": ""
16531701
}

‎imageConfigs/Dockerfile.nodeEx‎ renamed to ‎imageConfigs/node-exporter/Dockerfile‎

File renamed without changes.

‎package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"colors": "^1.4.0",
2525
"cors": "^2.8.5",
2626
"electron-squirrel-startup": "^1.0.0",
27+
"node": "^19.2.0",
2728
"os": "^0.1.2",
2829
"os-utils": "^0.0.14",
2930
"pg": "^8.8.0",
@@ -45,6 +46,11 @@
4546
"@babel/preset-env": "^7.19.3",
4647
"@babel/preset-react": "^7.18.6",
4748
"@babel/preset-typescript": "^7.18.6",
49+
"@electron-forge/cli": "^6.0.5",
50+
"@electron-forge/maker-deb": "^6.0.5",
51+
"@electron-forge/maker-rpm": "^6.0.5",
52+
"@electron-forge/maker-squirrel": "^6.0.5",
53+
"@electron-forge/maker-zip": "^6.0.5",
4854
"@jest/globals": "^29.3.1",
4955
"@redux-devtools/core": "^3.13.1",
5056
"@reduxjs/toolkit": "^1.9.0",

0 commit comments

Comments
 (0)