grafana: 9.1.1 -> 9.1.2

3 files changed, 21 insertions, 34 deletions

diff --git a/grafana/.footprint b/grafana/.footprint
index d30885966..b20833536 100644
--- a/grafana/.footprint
+++ b/grafana/.footprint
@@ -11,24 +11,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/grafana/
 drwxr-xr-x	root/root	usr/share/grafana/conf/
--rw-r--r--	root/root	usr/share/grafana/conf/.golangci.toml
 -rw-r--r--	root/root	usr/share/grafana/conf/defaults.ini
--rw-r--r--	root/root	usr/share/grafana/conf/ldap.toml
--rw-r--r--	root/root	usr/share/grafana/conf/ldap_multiple.toml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/access-control/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/access-control/sample.yaml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/alerting/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/alerting/sample.yaml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/dashboards/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/dashboards/sample.yaml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/datasources/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/datasources/sample.yaml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/notifiers/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/notifiers/sample.yaml
-drwxr-xr-x	root/root	usr/share/grafana/conf/provisioning/plugins/
--rw-r--r--	root/root	usr/share/grafana/conf/provisioning/plugins/sample.yaml
--rw-r--r--	root/root	usr/share/grafana/conf/sample.ini
 drwxr-xr-x	root/root	usr/share/grafana/public/
 -rw-r--r--	root/root	usr/share/grafana/public/api-merged.json
 -rw-r--r--	root/root	usr/share/grafana/public/api-spec.json
@@ -2863,6 +2846,7 @@ drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azu
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.test.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
+-rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/tracking.ts
 drwxr-xr-x	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/index.ts
 -rw-r--r--	root/root	usr/share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/logAnalyticsMetadata.ts
diff --git a/grafana/.signature b/grafana/.signature
index e41d11213..323cabf7c 100644
--- a/grafana/.signature
+++ b/grafana/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32RBCVnaScHCAibuQ5tU00085wA5U5cCPkck9T0C2mOPa/mqo7fg3s35XWwDqS2UOI6Aw7uF+Oxf8vM2267FCAU=
-SHA256 (Pkgfile) = b2e3f2ef1e3c65e13565498f21077ee9dd7b2ae5e95cfced18ea3ea1660ac5a0
-SHA256 (.footprint) = 4d52f2cf282db00d7ae03b30ceca85c0fd7c56e3fc4041e028a740374fbad3ce
-SHA256 (grafana-9.1.1.tar.gz) = 2433bf28b2667e9d5f805993ee38d71a108dd46938c5c5aa44dda6905eab9dde
-SHA256 (grafana-9.1.1.linux-amd64.tar.gz) = c356a5a39ecd3ec26da0cfbb4276de53c1c206e6e2f600e64c995bc5d9da7e74
+RWSagIOpLGJF39EfjkX3ttrJzm5FS9/OTDqfDIm6FScQP1iRpZ18bteKeHmp0pX9DpZXc/IsX2ldAGxx7NlSQYaNx5eSkTgHxw8=
+SHA256 (Pkgfile) = 34862d933b877fca0bfd71f0cc36f28fa788ef94861261c8dd1852ed244dcfa8
+SHA256 (.footprint) = 8439b26d325b934a45a4d602b30009c1ef304f0f65c533f245b02e88c8d5831b
+SHA256 (grafana-9.1.2.tar.gz) = 6d15ba3e34c9dd26d1fdf6358e4e02b06b82fa6abea26029df0f2f6f890ba5fd
+SHA256 (grafana-9.1.2.linux-amd64.tar.gz) = 3b082a5cc372eb916d0c97130eb7deddafaae0aef4a7fdfcd23400c5ca26d52e
 SHA256 (grafana.confd) = 302e0281dea67cde2edd1e7d06bd7abf6a8b335595c050ffa874cb1c1bd19036
 SHA256 (grafana.service) = 3b652a54c5f26d19197955854483687d7c761a2299788a182200acd5d1ffbb47
diff --git a/grafana/Pkgfile b/grafana/Pkgfile
index ebe2eb04a..45df81c2e 100644
--- a/grafana/Pkgfile
+++ b/grafana/Pkgfile
@@ -1,10 +1,10 @@
 # Description: The analytics platform for all your metrics
 # URL: https://grafana.com/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: fontconfig go
+# Depends on: fontconfig go yarn
 
 name=grafana
-version=9.1.1
+version=9.1.2
 release=1
 source=(https://github.com/grafana/grafana/archive/v$version/$name-$version.tar.gz
   https://dl.grafana.com/oss/release/grafana-$version.linux-amd64.tar.gz
@@ -27,19 +27,22 @@ build() {
   sed -ri 's,^(\s*provisioning\s*=).*,\1 /var/lib/grafana/conf/provisioning,' conf/defaults.ini
   sed -ri 's,^(\s*logs\s*=).*,\1 /var/log/grafana,' conf/defaults.ini
 
-  go get -u gonum.org/v1/gonum@v0.11.0
-  GOBIN="$(pwd)" go install github.com/google/wire/cmd/wire@v0.5.0
-  ./wire gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner
-  local ldflags="-X main.version=$pkgver -X main.commit=$_commit -X main.buildstamp=$_stamp"
-  go build -ldflags "$ldflags" -v ./pkg/cmd/grafana-server
-  go build -ldflags "$ldflags" -v ./pkg/cmd/grafana-cli
+  make gen-go
+  go run build.go setup
+  go run build.go build
+  export NPM_CONFIG_PREFIX="$srcdir/npm"
+  export PATH+=":$NPM_CONFIG_PREFIX/bin"
+  export NODE_OPTIONS="--max-old-space-size=16000" # Increase to 8 GB
+  yarn install
+  NODE_ENV=production yarn run build
 
   install -Dm644 $SRC/$name.confd $PKG/etc/conf.d/$name
-  install -Dsm755 grafana-server $PKG/usr/bin/grafana-server
-  install -Dsm755 grafana-cli $PKG/usr/bin/grafana-cli
+  install -Dsm755 bin/linux-amd64/grafana-server $PKG/usr/bin/grafana-server
+  install -Dsm755 bin/linux-amd64/grafana-cli $PKG/usr/bin/grafana-cli
   install -Dm644 conf/sample.ini $PKG/etc/grafana.ini
-  install -dm755 $PKG/usr/share/grafana
-  cp -r conf public $PKG/usr/share/$name/
+  install -Dm644 conf/defaults.ini $PKG/usr/share/$name/conf/defaults.ini
+  install -dm755 $PKG/usr/share/$name
+  cp -r public $PKG/usr/share/$name/
 
   ## install rc file
   install -Dm 755 $SRC/grafana.service $PKG/etc/rc.d/grafana