software/grafana: version up grafana 11.5.0, loki 3.3.2, telegraf 1.33.0

software/grafana/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 86e379ac6ba789d65369ca1e0d4dfa3f
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = 89fd1b010351cea9968360054e0c4aa9
+md5sum = eeb529b2b6a8e762a9072c520691c66c
 
 
 [influxdb-config-file]
@@ -32,7 +32,7 @@ md5sum = a28972ced3e0f4aa776e43a9c44717c0
 
 [grafana-config-file]
 filename = grafana-config-file.cfg.in
-md5sum = 258a25781f164f933fae12b9e1bc55fc
+md5sum = aa0d98f3604dd964ca6f3683c463acf7
 
 [grafana-provisioning-dashboards-config-file]
 filename = grafana-provisioning-dashboards-config-file.cfg.in

software/grafana/grafana-config-file.cfg.in

@@ -34,7 +34,7 @@ protocol = https
 
 # The ip address to bind to, empty will bind to all interfaces
 #http_addr =
-http_addr = [{{ grafana['ipv6'] }}]
+http_addr = {{ grafana['ipv6'] }}
 
 # The http port  to use
 #http_port = 3000
@@ -460,8 +460,7 @@ global_api_key = -1
 global_session = -1
 
 #################################### Alerting ############################
-[alerting]
-# Disable alerting engine & UI features
+[unified_alerting]
 enabled = true
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 execute_alerts = true

software/grafana/instance-agent.cfg.in

@@ -80,9 +80,10 @@ port = ${influxdb-server:port}
 [telegraf]
 recipe = slapos.cookbook:wrapper
 extra-config-dir = ${directory:telegraf-extra-config-dir}
-# telegraf needs influxdb to be already listening before starting
+# telegraf needs influxdb to be already listening before starting, so we wrap this command in bash.
+# we also run a login shell so that $PATH is initialized and sensors plugin can find sensors command.
 command-line =
-   bash -c '${influxdb-listen-promise:path} && ${:nice} {{ telegraf_bin }} --config ${telegraf-config-file:output} --config-directory ${:extra-config-dir}'
+   bash --login -c '${influxdb-listen-promise:path} && ${:nice} {{ telegraf_bin }} --config ${telegraf-config-file:output} --config-directory ${:extra-config-dir}'
 wrapper-path = ${directory:service}/telegraf
 hash-files = ${telegraf-config-file:output}
 # TODO: control nice of the agent ?
@@ -162,9 +163,11 @@ init =
     }
   )
   inputs["disk"].append({})
-  inputs["io"].append({})
+  inputs["diskio"].append({})
+  inputs["mdstat"].append({"interval": "1h"})
   inputs["mem"].append({})
   inputs["net"].append({"ignore_protocol_stats": True})
+  inputs["sensors"].append({"interval": "5m"})
   inputs["system"].append({})
 
   for application in slapparameter_dict.get("applications", []):

software/grafana/software.cfg

@@ -23,18 +23,30 @@ parts =
   fluent-bit
   post-install-cleanup
 
+[yarn]
+<= yarn-4.6.0
+
+[nodejs]
+<= nodejs-22.11.0
+
+[nodejs-headers]
+<= nodejs-headers-22.11.0
+
+[gcc]
+part = gcc-12.3
+min_version = 12.3.0
 
 [go_github.com_grafana_grafana]
 <= go-git-package
 go.importpath = github.com/grafana/grafana
 repository    = https://github.com/grafana/grafana
-revision      = v10.1.2-0-g8e428858dd
+revision      = v11.5.0-0-gf7a938db9ad
 
 [go_github.com_grafana_loki]
 <= go-git-package
 go.importpath = github.com/grafana/loki
 repository    = https://github.com/grafana/loki
-revision      = v3.1.0-0-g935aee77e
+revision      = v3.3.2-0-g23b5fc2c9
 
 [go_github.com_influxdata_influxdb]
 <= go-git-package
@@ -46,7 +58,7 @@ revision      = v1.8.4-0-gbc8ec4384e
 <= go-git-package
 go.importpath = github.com/influxdata/telegraf
 repository    = https://github.com/influxdata/telegraf
-revision      = v1.28.1-0-g3ea9ffbe2
+revision      = v1.33.0-0-g679020053
 
 [go_github.com_perrinjerome_slapos_telegraf_input]
 <= go-git-package
@@ -92,15 +104,16 @@ grafana-bin = ${grafana:binpath}/grafana
 grafana-homepath = ${grafana:homepath}
 loki-bin = ${:bin}/loki
 promtail-bin = ${:bin}/promtail
+golang  = ${golang1.23:location}
 
 [post-install-cleanup]
 recipe = plone.recipe.command
 stop-on-error = true
 # remove caches and binary files confusing software check
 command =
-  chmod +w ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.2/testdata/ \
-  && rm -rf ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.2/testdata/so.so \
-  && chmod -w ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.2/testdata/ \
+  chmod +w ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.4/testdata/ \
+  && rm -rf ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.4/testdata/so.so \
+  && chmod -w ${gowork.dir:directory}/pkg/mod/github.com/gabriel-vasile/mimetype@v1.4.4/testdata/ \
   && rm -rf ${buildout:directory}/.cache/
 
 [grafana]
@@ -108,15 +121,12 @@ recipe = plone.recipe.command
 command = bash -ce "
   cd ${:homepath} && \
   . ${gowork:env.sh} && \
-  go install github.com/google/wire/cmd/wire@v0.5.0 && \
-  wire gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner && \
+  go run ./pkg/build/wire/cmd/wire/main.go gen -tags oss ./pkg/server && \
   go run build.go setup && \
   go run build.go build && \
   export NODE_OPTIONS=--max_old_space_size=8192 && \
   ${yarn:location}/bin/yarn install --immutable && \
-  ${yarn:location}/bin/yarn run themes:generate && \
-  ${yarn:location}/bin/yarn run build && \
-  ${yarn:location}/bin/yarn run plugins:build-bundled"
+  ${yarn:location}/bin/yarn run build"
 homepath = ${go_github.com_grafana_grafana:location}
 # XXX "linux-amd64" is not portable here
 binpath = ${go_github.com_grafana_grafana:location}/bin/linux-amd64