Grafana version up

See merge request !1725

component/golang/buildout.cfg

@@ -124,6 +124,14 @@ patches +=
 # Backport of https://github.com/golang/go/commit/d1d93129506c78cc8ee25644384286822d93c81a
   ${:_profile_base_location_}/crypto-tls-fix-Config.Time-in-tests-using-expired-ce-go-1-21.patch#8e30a06c854a9654e5b789c887453d64
 
+[golang1.23]
+<= golang-common
+url = https://go.dev/dl/go1.23.5.src.tar.gz
+md5sum = e13bea63175a402f3bdac29a048cc8b6
+# go1.23 requires go1.20.6 to bootstrap (see https://go.dev/blog/rebuild)
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang1.21:location}
+
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is the top-level section that defines Go workspace.

component/nodejs/buildout.cfg

@@ -13,6 +13,7 @@ parts =
   nodejs
 
 # nodejs >= 16 needs gcc >= 8.3
+# nodejs >= 22 needs gcc >= 12.3
 [gcc]
 min_version = 8.3
 
@@ -60,6 +61,17 @@ version = v18.18.0
 md5sum = c5ab3e98977dfd639d830625d79eff52
 
 
+[nodejs-22.11.0]
+<= nodejs-base
+version = v22.11.0
+md5sum = 573831fd2b7abf70a882946e511b64f4
+
+[nodejs-headers-22.11.0]
+<= nodejs-headers-base
+version = v22.11.0
+md5sum = 45ffb2b6ff09e4391caa6beb13343721
+
+
 [nodejs-14.16.0]
 <= nodejs-base
 version = v14.16.0

component/yarn/buildout.cfg

@@ -62,3 +62,30 @@ md5sum = db82fa09c996e9318f2f1d2ab99228f9
 <= yarn-download
 version = 1.16.0
 md5sum = 46790033c23803387890f545e4040690
+
+[yarn-berry-install]
+recipe = slapos.recipe.build
+shared = true
+url = https://github.com/yarnpkg/berry/archive/refs/tags/@yarnpkg/cli/${:version}.tar.gz
+content =
+  #!/bin/sh
+  PATH=${nodejs:location}/bin/:$PATH
+  exec %(location)s/scripts/bin/yarn $@
+install =
+  import os
+  import subprocess
+  self.copyTree(guessworkdir(self.extract(self.download())), location)
+  bin = os.path.join(location, 'bin')
+  os.makedirs(bin)
+  yarn = os.path.join(bin, 'yarn')
+  with open(yarn, 'w') as f:
+    os.fchmod(f.fileno(), 0o755)
+    f.write(options['content'] % options)
+  # run a yarn command so that it finishes initialization before the installation directory
+  # is made read only.
+  subprocess.check_output([yarn, 'cache', 'clean'])
+
+[yarn-4.6.0]
+<= yarn-berry-install
+version = 4.6.0
+md5sum = aa26ce25aa0f214c75e2362a06e1cab0

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