Merge ~ballot/prometheus-snap/+git/prometheus-snap:upgrade_2.34.0 into prometheus-snap:master

[Benjamin Allot]

Updating prometheus to 2.34.0 and removing the workaround for non-amd64

[Barry Price (barryprice)]

Could shellcheck the override-build script, and would be nice to get onto Go 1.18, but I think we can circle back to those, this is still worth landing to get a newer prometheus and fix the other issues

review: Approve

diff --git a/.gitignore b/.gitignore
index 252d247..e9d9154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /*.snap
+/snap/
 /parts/
 /stage/
 /prime/
diff --git a/daemon_arguments b/daemon_arguments
index a1a8e21..6bb5f84 100644
--- a/daemon_arguments
+++ b/daemon_arguments
@@ -4,140 +4,45 @@ ARGS=""
 ##############################################################################
 # WARNINIG: Due to snap confinement the following options should not be set: #
 ##############################################################################
-# -config.file
-# -storage.local.path
+# --config.file
+# --storage.tsdb.path
 
-
-# Prometheus supports the following options:
-#   -log.level "info"
-#      Only log messages with the given severity or above. Valid levels:
-#      [debug, info, warn, error, fatal, panic].
-#
-# == ALERTMANAGER ==
-#
-#   -alertmanager.http-deadline 10s
-#      Alert manager HTTP API timeout.
-#
-#   -alertmanager.notification-queue-capacity 100
-#      The capacity of the queue for pending alert manager notifications.
-#
-#   -alertmanager.url
-#      The URL of the alert manager to send notifications to.
-#
-# == QUERY ==
-#
-#   -query.max-concurrency 20
-#      Maximum number of queries executed concurrently.
-#
-#   -query.staleness-delta 5m0s
-#      Staleness delta allowance during expression evaluations.
-#
-#   -query.timeout 2m0s
-#      Maximum time a query may take before being aborted.
-#
-# == STORAGE ==
-#
-#   -storage.local.checkpoint-dirty-series-limit 5000
-#      If approx. that many time series are in a state that would require
-#      a recovery operation after a crash, a checkpoint is triggered, even if
-#      the checkpoint interval hasn't passed yet. A recovery operation requires
-#      a disk seek. The default limit intends to keep the recovery time below
-#      1min even on spinning disks. With SSD, recovery is much faster, so you
-#      might want to increase this value in that case to avoid overly frequent
-#      checkpoints.
-#
-#   -storage.local.checkpoint-interval 5m0s
-#      The period at which the in-memory metrics and the chunks not yet
-#      persisted to series files are checkpointed.
-#
-#   -storage.local.chunk-encoding-version 1
-#      Which chunk encoding version to use for newly created chunks.
-#      Currently supported is 0 (delta encoding) and 1 (double-delta encoding).
-#
-#   -storage.local.dirty false
-#      If set, the local storage layer will perform crash recovery even if
-#      the last shutdown appears to be clean.
-#
-#   -storage.local.index-cache-size.fingerprint-to-metric 10485760
-#      The size in bytes for the fingerprint to metric index cache.
-#
-#   -storage.local.index-cache-size.fingerprint-to-timerange 5242880
-#      The size in bytes for the metric time range index cache.
-#
-#   -storage.local.index-cache-size.label-name-to-label-values 10485760
-#      The size in bytes for the label name to label values index cache.
-#
-#   -storage.local.index-cache-size.label-pair-to-fingerprints 20971520
-#      The size in bytes for the label pair to fingerprints index cache.
-#
-#   -storage.local.max-chunks-to-persist 1048576
-#      How many chunks can be waiting for persistence before sample
-#      ingestion will stop. Many chunks waiting to be persisted will increase
-#      the checkpoint size.
-#
-#   -storage.local.memory-chunks 1048576
-#      How many chunks to keep in memory. While the size of a chunk is
-#      1kiB, the total memory usage will be significantly higher than this value
-#      * 1kiB. Furthermore, for various reasons, more chunks might have to be
-#      kept in memory temporarily.
-#
-#   -storage.local.pedantic-checks false
-#      If set, a crash recovery will perform checks on each series file.
-#      This might take a very long time.
-#
-#   -storage.local.retention 360h0m0s
-#      How long to retain samples in the local storage.
-#
-#   -storage.local.series-sync-strategy "adaptive"
-#      When to sync series files after modification. Possible values:
-#      'never', 'always', 'adaptive'. Sync'ing slows down storage performance
-#      but reduces the risk of data loss in case of an OS crash. With the
-#      'adaptive' strategy, series files are sync'd for as long as the storage
-#      is not too much behind on chunk persistence.
-#
-#   -storage.remote.influxdb-url
-#      The URL of the remote InfluxDB server to send samples to. None, if
-#      empty.
-#
-#   -storage.remote.influxdb.database "prometheus"
-#      The name of the database to use for storing samples in InfluxDB.
-#
-#   -storage.remote.influxdb.retention-policy "default"
-#      The InfluxDB retention policy to use.
-#
-#   -storage.remote.opentsdb-url
-#      The URL of the remote OpenTSDB server to send samples to. None, if
-#      empty.
-#
-#   -storage.remote.timeout 30s
-#      The timeout to use when sending samples to the remote storage.
-#
-# == WEB ==
-#
-#   -web.console.libraries "/etc/prometheus/console_libraries"
-#      Path to the console library directory.
-#
-#   -web.console.templates "/etc/prometheus/consoles"
-#      Path to the console template directory, available at /consoles.
-#
-#   -web.enable-remote-shutdown false
-#      Enable remote service shutdown.
-#
-#   -web.external-url
-#      The URL under which Prometheus is externally reachable (for
-#      example, if Prometheus is served via a reverse proxy). Used for
-#      generating relative and absolute links back to Prometheus itself. If
-#      omitted, relevant URL components will be derived automatically.
-#
-#   -web.listen-address ":9090"
-#      Address to listen on for the web interface, API, and telemetry.
-#
-#   -web.local-assets "/usr/share/prometheus/web/"
-#      Path to static assets/templates directory.
-#
-#   -web.telemetry-path "/metrics"
-#      Path under which to expose metrics.
-#
-#   -web.user-assets
-#      Path to static asset directory, available at /user.
-#
+# Flags supported by the charm:
+#       --web.listen-address="0.0.0.0:9090"
+#                                  Address to listen on for UI, API, and telemetry.
+#       --web.read-timeout=5m      Maximum duration before timing out read of the request,
+#                                  and closing idle connections.
+#       --web.max-connections=512  Maximum number of simultaneous connections.
+#       --web.external-url=<URL>   The URL under which Prometheus is externally reachable (for example, if Prometheus
+#                                  is served via a reverse proxy). Used for generating relative and absolute links back
+#                                  to Prometheus itself. If the URL has a path portion, it will be used to prefix all
+#                                  HTTP endpoints served by Prometheus. If omitted, relevant URL components will be
+#                                  derived automatically.
+#       --web.route-prefix=<path>  Prefix for the internal routes of web endpoints.
+#                                  Defaults to path of --web.external-url.
+#       --web.user-assets=<path>   Path to static asset directory, available at /user.
+#       --web.enable-lifecycle     Enable shutdown and reload via HTTP request.
+#       --web.enable-admin-api     Enables API endpoints for admin control actions.
+#       --web.console.templates="consoles"
+#                                  Path to the console template directory, available at /consoles.
+#       --web.console.libraries="console_libraries"
+#                                  Path to the console library directory.
+#       --storage.tsdb.min-block-duration=2h
+#                                  Minimum duration of a data block before being persisted.
+#       --storage.tsdb.max-block-duration=<duration>
+#                                  Maximum duration compacted blocks may span. (Defaults to
+#                                  10% of the retention period)
+#       --storage.tsdb.retention=15d
+#                                  How long to retain samples in the storage.
+#       --storage.tsdb.no-lockfile
+#                                  Do not create lockfile in data directory.
+#       --alertmanager.notification-queue-capacity=10000
+#                                  The capacity of the queue for pending alert manager notifications.
+#       --alertmanager.timeout=10s
+#                                  Timeout for sending alerts to Alertmanager.
+#       --query.lookback-delta=5m  The delta difference allowed for retrieving metrics during expression evaluations.
+#       --query.timeout=2m         Maximum time a query may take before being aborted.
+#       --query.max-concurrency=20
+#                                  Maximum number of queries executed concurrently.
+#       --log.level=info           Only log messages with the given severity or above.
+#                                  One of: [debug, info, warn, error]
diff --git a/snap_config_wrapper b/snap_config_wrapper
index 0283233..ae4d288 100755
--- a/snap_config_wrapper
+++ b/snap_config_wrapper
@@ -6,4 +6,4 @@ test -d $SNAP_DATA/promreg || mkdir $SNAP_DATA/promreg
 
 ulimit -n 65536
 . $SNAP_DATA/daemon_arguments
-$SNAP/bin/prometheus $ARGS -config.file=$SNAP_DATA/prometheus.yml -storage.local.path=$SNAP_COMMON
+$SNAP/bin/prometheus $ARGS --config.file=$SNAP_DATA/prometheus.yml --storage.tsdb.path=$SNAP_COMMON
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f721fc7..f902a31 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,51 +1,63 @@
 name: prometheus
-version: 1.8.2
+version: 2.34.0
+base: core20
 grade: stable
 summary: The Prometheus monitoring system and time series database
 description: |
   Prometheus is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true.
 confinement: strict
+architectures:
+  - build-on: amd64
+  - build-on: arm64
+  - build-on: ppc64el
+  - build-on: s390x
+
 apps:
   prometheus:
     command: 'bin/prometheus.wrapper'
     plugs: [network-bind, network, content]
     daemon: simple
-    stop-timeout: 1800s
+    stop-timeout: 900s
   promtool:
+    plugs: [home]
     command: 'bin/promtool'
 plugs:
   content:
+    interface: content
     content: promreg
     target: $SNAP_DATA/promreg
+
 parts:
   prometheus:
     plugin: go
+    go-channel: 1.18/stable
     source: https://github.com/prometheus/prometheus.git
-    source-tag: v1.8.2
-    go-importpath: github.com/prometheus/prometheus
-    build-packages: [golang-1.8]
-    build: |
-        # Make sure we use go 1.8
-        export "PATH=/usr/lib/go-1.8/bin/:$PATH"
-        export "GOPATH=$PWD/../go" "PATH=$PATH:$PWD/../go/bin"
-        cd ../go/src/github.com/prometheus/prometheus/
-        make promu
-        make build
-    install: |
-        mkdir $SNAPCRAFT_PART_INSTALL/bin
-        cp -p $SNAPCRAFT_PART_INSTALL/../src/promtool $SNAPCRAFT_PART_INSTALL/bin/
-        cp -p $SNAPCRAFT_PART_INSTALL/../src/prometheus $SNAPCRAFT_PART_INSTALL/bin/
-  example-config:
-    plugin: dump
-    source: https://github.com/prometheus/prometheus.git
-    source-tag: v1.8.2
-    source-type: git
-    organize:
-      documentation/examples/prometheus.yml: etc/prometheus/prometheus.yml.example
-    stage:
-      - etc/prometheus/prometheus.yml.example
-    prime:
-      - etc/prometheus/prometheus.yml.example
+    source-tag: v${SNAPCRAFT_PROJECT_VERSION}
+    build-packages: [build-essential, curl, make, wget]
+    override-build: |
+      set -x
+      NODE_VERSION=16.14.0
+      NODE_ARCH=$(dpkg --print-architecture)
+      case "${NODE_ARCH}" in
+        "amd64")
+          NODE_ARCH="x64"
+          ;;
+        "ppc64el")
+          NODE_ARCH="ppc64le"
+          ;;
+      esac
+      wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz
+      mkdir -p /usr/local/lib/nodejs
+      tar xf node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz -C /usr/local/lib/nodejs
+      export PATH=/usr/local/lib/nodejs/node-v${NODE_VERSION}-linux-${NODE_ARCH}/bin:$PATH
+      npm install yarn -g
+      make build
+      make common-test-short
+      mkdir -p "$SNAPCRAFT_PART_INSTALL/bin"
+      mkdir -p "$SNAPCRAFT_PART_INSTALL/etc/prometheus"
+      cp -p "$SNAPCRAFT_PART_BUILD/promtool" "$SNAPCRAFT_PART_INSTALL/bin/"
+      cp -p "$SNAPCRAFT_PART_BUILD/prometheus" "$SNAPCRAFT_PART_INSTALL/bin/"
+      cp -p "$SNAPCRAFT_PART_SRC/documentation/examples/prometheus.yml" "$SNAPCRAFT_PART_INSTALL/etc/prometheus/prometheus.yml.example"
   snap-wrappers:
     plugin: dump
     source: .