fix reload prometheus config

Author: remcoros

startos/actions/config.ts

@@ -100,7 +100,7 @@ async function writeSettings(effects: T.Effects, input: InputSpec) {
       },
     ],
   })
-  
+
   await reloadPrometheusConfig.run({
     effects,
     input: {},

startos/actions/reloadPrometheusConfig.ts

@@ -1,3 +1,4 @@
+import { manifest } from '../manifest'
 import { sdk } from '../sdk'
 
 export const reloadPrometheusConfig = sdk.Action.withoutInput(
@@ -20,7 +21,7 @@ export const reloadPrometheusConfig = sdk.Action.withoutInput(
 
   // execution function
   async ({ effects }) => {
-    const status = await sdk.getStatus(effects, { packageId: 'grafana' })
+    const status = await sdk.getStatus(effects, { packageId: manifest.id })
 
     if (status.main === 'running') {
       await reloadPrometheus()

startos/main.ts

@@ -90,9 +90,18 @@ export const main = sdk.setupMain(async ({ effects, started }) => {
   exec(`chmod g+w ${jsonExporterSubcontainer.rootfs}/config`)
 
   // grafana provisioning
-  exec(`cp ${grafanaSubcontainer.rootfs}/assets/provisioning/datasources/prometheus.yml ${grafanaSubcontainer.rootfs}/etc/grafana/provisioning/datasources/prometheus.yml`)
-  exec(`cp ${grafanaSubcontainer.rootfs}/assets/provisioning/dashboards/dashboards.yml ${grafanaSubcontainer.rootfs}/etc/grafana/provisioning/dashboards/dashboards.yml`)
-  exec(`cp ${grafanaSubcontainer.rootfs}/assets/dashboards/axeos.json ${grafanaSubcontainer.rootfs}/etc/grafana/dashboards/axeos.json`)
+  exec(
+    `cp ${grafanaSubcontainer.rootfs}/assets/provisioning/datasources/prometheus.yml ` +
+      `${grafanaSubcontainer.rootfs}/etc/grafana/provisioning/datasources/prometheus.yml`,
+  )
+  exec(
+    `cp ${grafanaSubcontainer.rootfs}/assets/provisioning/dashboards/dashboards.yml ` +
+      `${grafanaSubcontainer.rootfs}/etc/grafana/provisioning/dashboards/dashboards.yml`,
+  )
+  exec(
+    `cp ${grafanaSubcontainer.rootfs}/assets/dashboards/axeos.json ` +
+      `${grafanaSubcontainer.rootfs}/etc/grafana/dashboards/axeos.json`,
+  )
 
   const healthReceipts: T.HealthCheck[] = []
 
@@ -103,7 +112,7 @@ export const main = sdk.setupMain(async ({ effects, started }) => {
       runAsInit: true,
       env: {},
       ready: {
-        display: 'JSON Exporter',
+        display: null,
         fn: () =>
           sdk.healthCheck.checkPortListening(effects, 7979, {
             successMessage: 'JSON Exporter is ready',
@@ -147,14 +156,14 @@ export const main = sdk.setupMain(async ({ effects, started }) => {
       ready: {
         display: 'Grafana', // If null, the health check will NOT be displayed to the user. If provided, this string will be the name of the health check and displayed to the user.
         // The function below determines the health status of the daemon.
+        gracePeriod: 60000,
         fn: () =>
           sdk.healthCheck.checkWebUrl(
             effects,
             'http://axeos-monitor-aio.startos:' + uiPort,
             {
-              timeout: 60000,
               successMessage: 'Grafana is ready',
-              errorMessage: 'Grafana is unreachable',              
+              errorMessage: 'Grafana is unreachable',
             },
           ),
       },