rpm/grafana
SHA256
1
0
Fork 0
forked from pool/grafana
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory pool:leap-16.0 pool:factory pool:devel
...
pull from: pool:leap-16.0
Branches Tags
pool:leap-16.0 pool:factory pool:devel rpm:factory

45 Commits
factory ... leap-16.0

Author SHA256 Message Date
Adrian Schröter
0502f5d9a2 Import openSUSE:Leap:16.0 modifications 2025-08-12 11:58:47 +02:00
Dominique Leuenberger
4dcf2a0491 Accepting request 1298088 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1298088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=78
 2025-08-07 14:48:48 +00:00
Witek Bedyk
88e4c0e1fb Clean up the changelog. 
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=176
 2025-08-07 08:04:28 +00:00
Ana Guerrero
d544058894 Accepting request 1295180 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1295180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=77
 2025-07-23 14:34:57 +00:00
Marius Kittler
e7cfd43506 Update to version 11.6.3+security-01: 
CVE-2025-6023: Fix cross-site-scripting via scripted dashboards (bsc#1246735)
  CVE-2025-6197: Fix open redirect in organization switching (bsc#1246736)

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=174
 2025-07-22 20:17:54 +00:00
Ana Guerrero
a5c6391036 Accepting request 1294188 from server:monitoring 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1294188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=76
 2025-07-18 13:58:43 +00:00
Marius Kittler
1b90ac6b55 Accepting request 1291705 from home:witekbedyk:branches:server:monitoring 
Bump disk space build constraint to 12 GB

OBS-URL: https://build.opensuse.org/request/show/1291705
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=172
 2025-07-10 15:19:58 +00:00
Ana Guerrero
8301828f36 Accepting request 1289515 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1289515
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=75
 2025-07-02 10:10:39 +00:00
Marius Kittler
9dda076208 Accepting request 1288821 from home:witekbedyk:branches:server:monitoring 
- Update to version 11.6.3:
  Security:
  CVE-2025-3415: Fix exposure of DingDing alerting integration URL
                 to Viewer level users (bsc#1245302)
- Update to version 11.6.2:
  * Drop 0003-Bump-x-net.patch
  * Drop 0004-Fix-CVE-2025-3580.patch
  Security:
  CVE-2025-1088: Fix improper input validation (bsc#1245224)

OBS-URL: https://build.opensuse.org/request/show/1288821
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=170
 2025-07-01 12:02:15 +00:00
Ana Guerrero
5dabc06f31 Accepting request 1283041 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1283041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=74
 2025-06-05 18:35:15 +00:00
Marius Kittler
48e52a8dcd Accepting request 1283035 from home:witekbedyk:branches:server:monitoring 
- Exclude ix86 architectures. They are not supported and fail to
  build.

OBS-URL: https://build.opensuse.org/request/show/1283035
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=168
 2025-06-05 10:43:52 +00:00
Ana Guerrero
15b84b6b96 Accepting request 1280633 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1280633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=73
 2025-05-27 16:44:19 +00:00
Marius Kittler
b87999eb9b Accepting request 1280627 from home:witekbedyk:branches:server:monitoring 
- Update to version 11.6.1+security-01:
  * Security:
    CVE-2025-4123: Fix cross-site scripting vulnerability
                   (bsc#1243714)
- CVE-2025-22872: Bump golang.org/x/net/html (bsc#1241809)
  * Add 0003-Bump-x-net.patch
- CVE-2025-3580: Prevent unauthorized server admin deletion
  (bsc#1243672)
  * Add 0004-Fix-CVE-2025-3580.patch

OBS-URL: https://build.opensuse.org/request/show/1280627
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=166
 2025-05-27 14:18:48 +00:00
Ana Guerrero
3cb6a6eb95 Accepting request 1278348 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1278348
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=72
 2025-05-22 14:55:27 +00:00
Marius Kittler
ba8b09b8a3 Accepting request 1277400 from home:witekbedyk:branches:server:monitoring 
Update to version 11.6.1

OBS-URL: https://build.opensuse.org/request/show/1277400
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=164
 2025-05-19 08:22:56 +00:00
Ana Guerrero
52ed274e4a Accepting request 1274371 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1274371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=71
 2025-05-05 20:28:22 +00:00
Witek Bedyk
d72345ebb1 Accepting request 1273453 from home:witekbedyk:branches:server:monitoring 
Update changelog

OBS-URL: https://build.opensuse.org/request/show/1273453
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=162
 2025-05-05 08:45:01 +00:00
Marius Kittler
ca956ddccc Accepting request 1273438 from home:witekbedyk:branches:server:monitoring 
- Update to version 11.5.4:
  Security:
  * CVE-2025-3454
  * CVE-2025-2703
  * CVE-2025-30204: Bump github.com/golang-jwt/jwt/v5 (bsc#1240503)
  * CVE-2024-6104: Bump OpenFGA to version 1.6.2 (bsc#1227039)

old: server:monitoring/grafana
new: home:witekbedyk:branches:server:monitoring/grafana rev None
Index: Makefile
===================================================================
--- Makefile (revision 160)
+++ Makefile (revision 3)
@@ -26,7 +26,6 @@
 	patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch && \
 	# End patches section \
 	# Patches for Go modules go after here \
-	patch --no-backup-if-mismatch -p1 -i ../../0003-Bump-go-jose.patch && \
 	# End of Go modules patches section \
 	go mod download && \
 	go mod verify && \
Index: _service
===================================================================
--- _service (revision 160)
+++ _service (revision 3)
@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v11.5.2</param>
+    <param name="revision">v11.5.4</param>
   </service>
   <service name="recompress" mode="manual">
     <param name="compression">gz</param>
Index: grafana.changes
===================================================================
--- grafana.changes (revision 160)
+++ grafana.changes (revision 3)
@@ -1,4 +1,40 @@
 -------------------------------------------------------------------
+Tue Apr 29 09:43:38 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
+
+- Update to version 11.5.4:
+  Features and enhancements:
+  * Azure Monitor: Filter namespaces by resource group
+  * Azure: Add support for custom namespace and custom metrics
+    variable queries
+  * Azure: Resource picker improvements
+  * Azure: Support more complex variable interpolation
+  * Azure: Variable editor and resource picker improvements
+  * DashboardScenePage: Correct slug in self referencing data links
+  * Dependencies: Bump github.com/redis/go-redis/v9
+    (CVE-2025-29923)
+  * Prometheus: Add support for cloud partners Prometheus data
+    sources
+  Bug fixes:
+  * InfluxDB: Fix nested variable interpolation
+  Security:
+  * CVE-2025-3454
+  * CVE-2025-2703
+  * CVE-2025-30204: Bump github.com/golang-jwt/jwt/v5 (bsc#1240503)
+
+- Update to version 11.5.3:
+  Bug fixes:
+  * Alerting: Fix token-based Slack image upload to work with
+    channel names
+  * Auth: Fix AzureAD config UI's ClientAuthentication dropdown
+  * Dashboard: Fix the unintentional time range and variables
+    updates on saving
+  * Dashboards: Fix missing v/e/i keybindings to return back to
+    dashboard
+  * InfluxDB: Improve handling of template variables contained in
+    regular expressions (InfluxQL)
+  * Org redirection: Fix linking between orgs
+
+-------------------------------------------------------------------
 Mon Mar 10 11:27:53 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
 
 - CVE-2025-27144: Fix Go JOSE's Parsing Vulnerability (bsc#1237671)
@@ -57,6 +93,8 @@
   * Dashboards: Customizable shareable dashboard panel images
   * Datasources: Time series macro support in visual query builder
     for SQL data sources
+  Security:
+  * CVE-2024-6104: Bump OpenFGA to version 1.6.2 (bsc#1227039)
 
 - Update to version 11.4.0:
   Features and enhancements:
Index: grafana.spec
===================================================================
--- grafana.spec (revision 160)
+++ grafana.spec (revision 3)
@@ -22,7 +22,7 @@
 %endif
 
 Name:           grafana
-Version:        11.5.2
+Version:        11.5.4
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only
@@ -37,8 +37,6 @@
 Source4:        Makefile
 Source5:        0001-Add-source-code-reference.patch
 Patch2:         0002-Use-bash-instead-of-env.patch
-# CVE-2025-27144
-Patch3:         0003-Bump-go-jose.patch
 BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  wire
Index: vendor.tar.gz
===================================================================
Binary files vendor.tar.gz (revision 160) and vendor.tar.gz (revision 3) differ
Index: grafana-11.5.4.tar.gz
===================================================================
Binary file grafana-11.5.4.tar.gz (revision 3) added
Index: 0003-Bump-go-jose.patch
===================================================================
--- 0003-Bump-go-jose.patch (revision 160)
+++ 0003-Bump-go-jose.patch (deleted)
@@ -1,28 +0,0 @@
-diff --git a/go.mod b/go.mod
-index c8b9d1ba5eb..48dbe231802 100644
---- a/go.mod
-+++ b/go.mod
-@@ -41,7 +41,7 @@ require (
- 	github.com/fatih/color v1.17.0 // @grafana/grafana-backend-group
- 	github.com/fullstorydev/grpchan v1.1.1 // @grafana/grafana-backend-group
- 	github.com/gchaincl/sqlhooks v1.3.0 // @grafana/grafana-search-and-storage
--	github.com/go-jose/go-jose/v3 v3.0.3 // @grafana/identity-access-team
-+	github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team
- 	github.com/go-kit/log v0.2.1 //  @grafana/grafana-backend-group
- 	github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/identity-access-team
- 	github.com/go-openapi/loads v0.22.0 // @grafana/alerting-backend
-diff --git a/go.sum b/go.sum
-index 41643ba4ce9..d1bf6924732 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1146,8 +1146,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
- github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
- github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
- github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
--github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
--github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
-+github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
-+github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
- github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
- github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
- github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
Index: grafana-11.5.2.tar.gz
===================================================================
Binary file grafana-11.5.2.tar.gz (revision 160) deleted

OBS-URL: https://build.opensuse.org/request/show/1273438
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=161
 2025-04-29 12:54:11 +00:00
Ana Guerrero
88851a5e27 Accepting request 1251843 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1251843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=70
 2025-03-10 19:19:15 +00:00
Marius Kittler
af7737579f Accepting request 1251836 from home:witekbedyk:branches:server:monitoring 
- CVE-2025-27144: Fix Go JOSE's Parsing Vulnerability (bsc#1237671)
  * Add 0003-Bump-go-jose.patch

OBS-URL: https://build.opensuse.org/request/show/1251836
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=159
 2025-03-10 16:03:35 +00:00
Marius Kittler
260cce0686 Accepting request 1251613 from home:etorres:branches:server:monitoring 
Update to version 11.5.2:
  Features and Enhancements
  * TransformationFilter: Include transformation outputs in transformation filtering options
  * grafana-ui: Update InlineField error prop type to React.ReactNode
  Bug fixes:
  * Alerting: Allow specifying uid for new rules added to groups
  * Alerting: Allow specifying uid for new rules added to groups
  * Alerting: Call RLock() before reading sendAlertsTo map
  * Auth: Fix redirect with JWT auth URL login
  * AuthN: Refetch user on "ErrUserAlreadyExists"
  * Azure: Correctly set application insights resource values
  * CodeEditor: Fix cursor alignment
  * DashboardList: Throttle the re-renders
  * Dashboards: Bring back scripted dashboards
  * Plugin Metrics: Eliminate data race in plugin metrics middleware
  * RBAC: Don't check folder access if annotationPermissionUpdate FT is enabled

OBS-URL: https://build.opensuse.org/request/show/1251613
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=158
 2025-03-10 09:38:28 +00:00
Ana Guerrero
57a2c0ec59 Accepting request 1247371 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1247371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=69
 2025-02-20 15:42:07 +00:00
Marius Kittler
b6aaad8bfc Accepting request 1247366 from home:witekbedyk:branches:server:monitoring 
Use /bin/bash in wrapper scripts. Old systems do not place bash in /usr/bin/

OBS-URL: https://build.opensuse.org/request/show/1247366
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=156
 2025-02-20 11:25:29 +00:00
Ana Guerrero
754638fd01 Accepting request 1245321 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1245321
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=68
 2025-02-12 20:36:30 +00:00
Marius Kittler
9dff2d3a71 Accepting request 1245273 from home:witekbedyk:branches:server:monitoring 
- Explicitly set CGO_ENABLED environment variable for architectures
  which require it
- Update to version 11.5.1:
  Security:
  * CVE-2024-51744: Fix bad documentation of error handling in
    ParseWithClaims (bsc#1232975)

OBS-URL: https://build.opensuse.org/request/show/1245273
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=154
 2025-02-12 09:55:49 +00:00
Ana Guerrero
94f470f975 Accepting request 1243887 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1243887
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=67
 2025-02-06 21:09:18 +00:00
Marius Kittler
aa06a6e5c9 Accepting request 1243630 from home:witekbedyk:branches:server:monitoring 
- Add simple testing

OBS-URL: https://build.opensuse.org/request/show/1243630
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=152
 2025-02-06 14:05:14 +00:00
Ana Guerrero
8158bb7a8a Accepting request 1242879 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1242879
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=66
 2025-02-03 20:45:41 +00:00
Marius Kittler
3dffb03992 Accepting request 1242874 from home:witekbedyk:branches:server:monitoring 
Update to version 11.3.3
  * CVE-2024-11741: Fix the Grafana Alerting VictorOps integration
    (bsc#1236734)
  * Chore: Bump dependency golang.org/x/crypto to v0.31.0
  * Drop 0004-Bump-crypto.patch
  * Require Go 1.23.5 or newer for building
- Add provisioning directories

OBS-URL: https://build.opensuse.org/request/show/1242874
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=150
 2025-02-03 15:41:53 +00:00
Ana Guerrero
40ef81b8e2 Accepting request 1239511 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1239511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=65
 2025-01-22 15:39:12 +00:00
Marius Kittler
a3bc9f6a43 Accepting request 1239509 from home:witekbedyk:branches:server:monitoring 
- Require Go 1.23.1 or newer for building
- Update to version 11.3.2

OBS-URL: https://build.opensuse.org/request/show/1239509
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=148
 2025-01-22 12:23:30 +00:00
Ana Guerrero
cade1e320c Accepting request 1238463 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1238463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=64
 2025-01-17 17:43:28 +00:00
Marius Kittler
01b33876c7 Accepting request 1238461 from home:witekbedyk:branches:server:monitoring 
- Fix incidentally wrongly uploaded source code tarball without
  generated frontend code

OBS-URL: https://build.opensuse.org/request/show/1238461
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=146
 2025-01-17 10:47:00 +00:00
Marius Kittler
4ba5d7abe6 Accepting request 1238452 from home:witekbedyk:branches:server:monitoring 
Fix incidentally wrongly uploaded source code tarball without generated frontend code.

OBS-URL: https://build.opensuse.org/request/show/1238452
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=145
 2025-01-17 10:27:01 +00:00
Ana Guerrero
0610b90e10 Accepting request 1238279 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1238279
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=63
 2025-01-16 17:34:53 +00:00
Witek Bedyk
101fc76132 Accepting request 1237398 from home:witekbedyk:branches:server:monitoring 
Security
  * CVE-2025-21613: Removes vulnerable library
    github.com/go-git/go-git/v5 (bsc#1235574)

OBS-URL: https://build.opensuse.org/request/show/1237398
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=143
 2025-01-16 14:15:06 +00:00
Ana Guerrero
ab608f4aac Accepting request 1236207 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1236207
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=62
 2025-01-12 10:14:37 +00:00
Marius Kittler
eaec319eb4 Accepting request 1236195 from home:witekbedyk:branches:server:monitoring 
Update changelog to mention the addition of the patch file

OBS-URL: https://build.opensuse.org/request/show/1236195
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=141
 2025-01-09 13:16:31 +00:00
Marius Kittler
66b67a8fde Accepting request 1236155 from home:witekbedyk:branches:server:monitoring 
- CVE-2024-45337: Prevent possible misuse of
  ServerConfig.PublicKeyCallback by upgrading golang.org/x/crypto
  (bsc#1234554)

OBS-URL: https://build.opensuse.org/request/show/1236155
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=140
 2025-01-09 12:22:55 +00:00
Ana Guerrero
c8246d4c95 Accepting request 1225277 from server:monitoring 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1225277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=61
 2024-11-20 16:03:19 +00:00
Marius Kittler
7df46d68e5 Accepting request 1223914 from home:witekbedyk:branches:server:monitoring 
Disable changelog autogeneration. The result is too long and not useful most of the times.

OBS-URL: https://build.opensuse.org/request/show/1223914
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=138
 2024-11-13 13:24:05 +00:00
Ana Guerrero
d4e242f1ad Accepting request 1222491 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1222491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=60
 2024-11-08 10:59:29 +00:00
Marius Kittler
25e818ec03 Accepting request 1222469 from home:witekbedyk:branches:server:monitoring 
- Use #!/usr/bin/bash shebang for package dependency generator to
  work correctly.
  * Add 0002-Use-bash-instead-of-env.patch

OBS-URL: https://build.opensuse.org/request/show/1222469
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=136
 2024-11-07 15:34:06 +00:00
Ana Guerrero
f6bd015823 Accepting request 1218803 from server:monitoring 
OBS-URL: https://build.opensuse.org/request/show/1218803
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=59
 2024-10-28 14:24:14 +00:00
Witek Bedyk
705ff79f3e Accepting request 1217348 from home:mkittler:branches:server:monitoring 
- Update to version 11.3.0:
  Features and enhancements:
  * Alerting: Add manage permissions UI logic for Contact Points
  * Alerting: Allow linking to silence form with __alert_rule_uid__
    value preset
  * Alerting: Hide query name when using simplified mode in the
    alert rule
  * Alerting: Limit and clean up old alert rules versions
  * Alerting: Style nits for the simple query mode
  * Alerting: Update texts in annotations step
  * Alerting: Use useProduceNewAlertmanagerConfiguration for contact
    points
  * Auth: Attach external session info to Grafana session
  * Auth: Replace jmespath/go-jmespath with
    jmespath-community/go-jmespath
  * CloudMigrations: Add support for migration of Library Elements
    (Panels) resources
  * Cloudwatch: Update grafana-aws-sdk
  * Explore Logs: Preinstall for onprem Grafana instances
  * ExploreMetrics: Ensure compatibility with Incremental Querying
  * FieldConfig: Add support for Actions
  * Plugin Extensions: Require meta-data to be defined in
    plugin.json during development mode
  * Tempo: Add deprecation notice for Aggregate By
  Bug fixes:
  * Alerting/Chore: Fix TimeRangeInput not working across multiple
    months
  * Alerting: Fix default value for input in simple condition
  * Alerting: Fix eval interval not being saved when creating a new
    group
  * Alerting: Fix incorrect permission on POST external rule groups
    endpoint [CVE-2024-8118]
  * Alerting: Fix panics when attempting to create an Alertmanager
    after failing
  * DashboardScene: Fixes url issue with subpath when exiting edit
    mode
  * Dashboards: Enable scenes by default
  * Dashboards: Fixes view & edit keyboard shortcuts when grafana is
    behind a subpath
  * ElasticSearch: Fix errorsource in newInstanceSettings
  * SubMenu: Fix expanding sub menu items on touch devices
- Packaging improvements:
  * Use `go work vendor` as the previous command runs into an error
    with the updated version of Grafana
- Update to version 11.2.2+security-01:
  Bug fixes
  * SQL Expressions: Fixes CVE-2024-9264
- Update to version 11.2.0:
  Features and enhancements:
  * @grafana/data: Introduce new getTagKeys/getTagValues response
    interface
  * AWS: Update deprecated aws-sdk functions from env variable
    versions
  * Alerting: Add ha_reconnect_timeout configuration option
  * Alerting: Add setting for maximum allowed rule evaluation
    results-akhmetov
  * Alerting: Add warning in telegram contact point
  * Alerting: Central alert history part4
  * Alerting: Don't crash the page when trying to filter rules by
    regex
  * Alerting: Enable remote primary mode using feature toggles
  * Alerting: Hide edit/view rule buttons according to
    deleting/creating state
  * Alerting: Implement UI for grafana-managed recording rules
  * Alerting: Improve performance of /api/prometheus for large
    numbers of alerts.
  * Alerting: Include a list of ref_Id and aggregated datasource
    UIDs to alerts when state reason is NoData-nihal
  * Alerting: Instrument outbound requests for Loki Historian and
    Remote Alertmanager with tracing
  * Alerting: Limit instances on alert detail view unless in
    instances tab
  * Alerting: Make alert group editing safer
  * Alerting: Make whitespace more visible on labels
  * Alerting: Remove option to return settings from api/v1/receivers
    and restrict provisioning action access
  * Alerting: Resend resolved notifications for ResolvedRetention
    duration
  * Alerting: Show Insights page only on cloud (when required ds's
    are available)
  * Alerting: Show repeat interval in timing options meta
  * Alerting: Support median in reduce expressions-akhmetov
  * Alerting: Track central ash interactions
  * Alerting: Update alerting state history API to authorize access
    using RBAC-tceretian
  * Alerting: Update warning message for Telegram parse_mode and
    default to empty value
  * Alerting: Use Runbook URL label everywhere and add validation in
    the alert rule…
  * Alerting: Use cloud notifier types for metadata on Cloud AMs
  * Alerting: Use stable identifier of a group when export to HCL
  * Alerting: Use stable identifier of a group,contact point,mute
    timing when export to HCL
  * Alertmanager: Support limits for silences
  * Angular deprecation: Disable dynamic angular inspector if
    CheckForPluginUpdates is false
  * App events: Add "info" variant-89
  * Auth: Add org to role mappings support to AzureAD/Entra
    integration
  * Auth: Add organization mapping configuration to the UI
  * Auth: Add support for escaping colon characters in org_mapping
  * Azure: Add new Azure infrastructure dashboards-chan
  * BrowseDashboards: Update results when starred param changes-89
  * Caching: Handle memcached reconnects
  * Calendar: Add labels for next/previous month
  * Canvas: Element level data links-almasan
  * Canvas: Improved tooltip-almasan
  * Canvas: Support template variables in base URL of actions
  * Chore: Add missing build elements to Dockerfile-de
  * Chore: Add unit test for cloudmigration package-deveikis
  * Chore: Commit results of bingo get
  * CloudMigrations: Change onPremToCloudMigrations feature toggle
    to public preview
  * CloudWatch: Add errorsource for QueryData
  * CloudWatch: Update grafana-aws-sdk for updated metrics
  * Cloudwatch: Clear cached PDC transport when PDC is disabled
  * Cloudwatch: Metrics Query Builder should clear old query
  * Cloudwatch: Remove awsDatasourcesNewFormStyling feature toggle
  * Cloudwatch: Rename Metric Query to Metric Insights
  * Cloudwatch: Round up endTime in GetMetricData to next minute
  * Dashboard: Use preferred timezone on create-89
  * Datalinks: UX improvements-almasan
  * DateTimePicker: Add "timeZone" prop-89
  * Dynatrace: Add to list of DS with custom label logic-grafana
  * Elasticsearch: Decouple backend from infra/http
  * Elasticsearch: Decouple backend from infra/log
  * Elasticsearch: Decouple backend from infra/tracing
  * Explore: Add setting for default time offset
  * Feat: Extending report interaction with static context that can
    be appended to all interaction events
  * Feature management: Add openSearchBackendFlowEnabled feature
    toggle
  * Features: Add cloudwatchMetricInsightsCrossAccount feature
    toggle
  * Features: Release Cloudwatch Metric Insights cross-account
    querying to public preview
  * FlameGraph: Remove flameGraphItemCollapsing feature
    toggle-grafana
  * GCP: Update GKE monitoring dashboard
  * GOps: Add Grafana SLO steps to IRM configuration tracker
  * Grafana: Enables use of encrypted certificates with password for
    https-deveikis
  * IDToken: Add current user's DisplayName to the ID token-stuart
  * IDToken: Add current user's Username and UID to the ID token
  * Keybinds: Allow move time range shortcuts (t left / t right) to
    be chained
  * LibraryPanels: Use new folder picker when creating a library
    panel
  * Log: Added panel support for filtering callbacks
  * Logs: Add log line to content outline when clicking on
    datalinks-grafana
  * Loki: Add option to issue forward queries
  * Loki: Added support for negative numbers in LogQL
  * Loki: Also replace step with vars
  * Loki: Remove instant query type from Log queries
  * Loki: Respect pre-selected filters in adhoc filter queries
  * MSSQL: Password auth for Azure AD
  * Metrics: Add ability to disable classic histogram for HTTP
    metric
  * Nav: Add items to saved-89
  * OpenAPI: Document the /api/health endpoint
  * PanelChrome: Use labelledby for accessible title
  * Plugins: Add filters by update available
  * Plugins: Add logs to for plugin management actions
  * Plugins: Disable install controls for provisioned plugin in
    cloud
  * Plugins: Expose functions to plugins for checking RBAC
    permissions
  * Plugins: Improve levitate / breaking changes report in
    grafana/grafana
  * Plugins: Support > 1 levels of plugin dependencies
  * Plugins: Update CLI check if plugin is already installed
  * Prometheus: Deprecation message for SigV4 in core Prom
  * Prometheus: Reintroduce Azure audience override feature flag
  * RBAC: Allow plugins to use scoped actions
  * RBAC: Default to plugins.app:access for plugin includes
  * Restore dashboards: Add RBAC-89
  * Revert: Calcs: Update diff percent to be a percent
  * SearchV2: Support soft deletion
  * Select: Add orange indicator to selected item
  * Snapshots: Remove deprecated option snapshot_remove_expired
  * Table panel: Add alt and title text options to image cell type
  * Tempo: Add toggle for streaming-grafana
  * Tempo: Remove kind=server from metrics summary-grafana
  * Tempo: Run go get-grafana
  * Tempo: TraceQL metrics step option
  * Tempo: Virtualize tags select to improve performance
  * Tempo: Virtualized search dropdowns for attribute values
  * TimePicker: Improve screen reader support
  * TimeRangePicker: Add weekStart prop-89
  * TimeRangePicker: Use week start-89
  * Tooltip: Add tooltip support to Histogram-almasan
  * Trace View: Add Session for this span button
  * Tracing: Add regex support for span filters
  * Transformations: Add variable support to select groupingToMatrix
  * Transformations: Move transformation variables to general
    availability
  * Transformations: Promote add field from calc stat function
    cumulative and window calcs as generally available
  * Transformations: Promote format string as generally available
  * Transformations: Promote group to nested table as generally
    available
  * Users: Add config option to control how often last_seen is
    updated
  * XYChart: Promote to generally available fixes
  * Admin: Fixes logic for enabled a user
  * Alerting: Add validation for path separators in the rule group
    edit modal
  * Alerting: Allow future relative time
  * Alerting: Disable simplified routing when internal alert manager
    is disabled
  * Alerting: Do not check evaluation interval for external rulers
  * Alerting: Do not count rule health for totals
  * Alerting: Fix Recording Rules creation issues
  * Alerting: Fix contact point export 500 error and
    notifications/receivers missing settings
  * Alerting: Fix permissions for prometheus rule
    endpoints-tceretian
  * Alerting: Fix persisting result fingerprint that is used by
    recovery threshold-tceretian
  * Alerting: Fix rule storage to filter by group names using
    case-sensitive comparison-tceretian
  * Alerting: Fix saving telegram contact point to Cloud AM config
  * Alerting: Fix setting of existing Telegram Chat ID value
  * Alerting: Fix silencing from policy instances
  * Alerting: Fix some status codes returned from provisioning API.
  * Alerting: Fix stale values associated with states that have gone
    to NoData, unify values calculation
  * Alerting: Refactor PromQL-style matcher parsing
  * Alerting: Skip fetching alerts for unsaved dashboards
  * Alerting: Skip loading alert rules for dashboards when disabled
  * Alerting: Support utf8_strict_mode: false in Mimir
  * Alerting: Time interval Delete API to check for usages in alert
    rules-tceretian
  * Analytics: Fix ApplicationInsights integration
  * Azure Monitor: Add validation for namespace field in
    AdvancedResourcePicker when entering a forward slash
  * AzureMonitor: Fix out of bounds error when accessing
    metricNamespaceArray and resourceNameArray in buildResourceURI
  * BrowseDashboards: Prepend subpath to New Browse Dashboard
    actions
  * CloudWatch: Fix labels for raw metric search queries
  * CloudWatch: Fix raw queries with dimensions set
  * Correlations: Fix wrong target data source name in the form
  * DashboardScene: Fixes issue removing override rule
  * DashboardScene: Fixes lack of re-render when updating field
    override properties
  * DataSourcePicker: Create new data source does not work for
    subpath
  * Docs: Add fixed role UUIDs to docs for terraform provisioning
  * Echo: Suppress errors from frontend-metrics API call failing
  * Explore Metrics: Implement grouping with metric prefixes
  * Fix: Portuguese Brazilian wasn't loading translations
  * Folders: Fix folder pagination for cloud instances with many
    folders
  * Folders: Improve folder move permission checks
  * InfluxDB: Fix query builder produces invalid SQL query when
    using wildcard column name-nihal
  * Inspect: Include only BOM char for excel files
  * Jaeger: Fix calling of search query with the correct time range
  * Metrics: Fix internal metrics endpoint not accessible from
    browser if basic auth is enabled-nihal
  * Notifications: Redact URL from errors
  * Panel: Fix text aliasing bug when panel is loading
  * Plugin extensions: Return react components from
    usePluginComponents()
  * Plugins: Ensure grafana cli can install multiple plugin
    dependencies
  * Prometheus: Fix interpolating adhoc filters with template
    variables
  * Prometheus: Fix query builder visualization when a query has
    by() clause for quantile-rs
  * QueryEditor: Break with Scenes because the default query is not
    empty string
  * RBAC: List only the folders that the user has access to
  * Scenes/Dashboards: Fix issue where changes in panel height
    weren't saved
  * Scenes: Fixes issue with panel repeat height calculation
  * Scenes: Implement 't a' shortcut
  * Table Panel: Fix Image hover without datalinks
  * Table component: Fix sub-table rows not displaying correctly
  * Tempo: Fix grpc streaming support over pdc-agent-s-dean
  * Tempo: Fix query history-grafana
  Breaking changes:
  * Folders: Allow folder editors and admins to create subfolders
    without any additional permissions
  Plugin development fixes & changes:
  * Runtime: Add provider and access hook for location service
- Update to version 11.1.0:
  Features and enhancements:
  * Tracing: Enable traces to profiles.
  * Auth: Add org to role mappings support to Google integration.
  * Alerting: Support AWS SNS integration in Grafana.-tceretian
  * Auth: Add org to role mappings support to Okta integration.
  * Auth: Add org to role mappings support to Gitlab integration.
  * Cloudwatch: Use the metric map from grafana-aws-sdk.
  * Alerting: Add option to use Redis in cluster mode for Alerting
    HA.-g
  * VizTooltip: Allow setting the maxWidth option.-almasan
  * Auth: Add org to role mappings support to GitHub integration .
  * CloudWatch: Handle permissions error and update docs.
  * ** Alerting:** Correctly handle duplicating notification
    templates.
  * Alerting: Mute Timing service to prevent changing provenance
    status to none.-tceretian
  * Alerting: Ensure we fetch AM config before saving new
    configuration.
  * Alerting: Remove regex reference in silences filter tooltip.
  * Cloudwatch: Update AWS DynamoDB Metrics.
  * Alerting: Make regex notification routing preview consistent
    with notification policies implementation.
  * DateTimePicker: Return cleared value in onChange.-89
  * NodeGraph: Add msagl and the layered layout code.
  * API: Add in theme support to /render/* endpoint.
  * Alerting: Add filters for RouteGetRuleStatuses.-g
  * Plugins: Update the plugin.json schema with UI extensions
    meta-data.
  * Auth: Update SAML lib to improve HTTP-Post binding.
  * Tempo: Send current filters when retrieving tags for
    AdHocFilters.-grafana
  * Tempo: Support standard span convention.-grafana
  * ValueFormats: Add Uruguay peso currency.
  * DateTimePicker: Add clearable prop.-89
  * Correlations: Enable feature toggle by default (on-prem).
  * Stat: Add percent change color modes.
  * Logs: Added multi-line display control to the "wrap lines"
    option.
  * Tempo: Update lezer autocomplete (histogram, quantile) and add
    missing functions.-grafana
  * AnnotationsPlugin2: Implement support for rectangular
    annotations in Heatmap.
  * CodeEditor: Improved styles when the code editor is loading.
  * CloudWatch: Add additional AWS/KinesisAnalytics metrics .
  * Cloudwatch: Add AWS/Events Metrics.
  * Azure: Basic Logs support.
  * Dashboard: Make dashboard search faster.
  * Alerting: Support custom API URL for PagerDuty integration.
  * Alerting: Add optional metadata via query param to silence GET
    requests.
  * Store: Enable adding extra middleware.-89
  * Tempo: Don't modify the passed time range when using
    timeShiftEnabled.
  * InfluxDB: Introduce maxDataPoints setting for flux variable
    query editor.
  * Alerting: New list view UI – Part 1.
  * NodeGraph: Remove msagl lib and layered layout option.
  * InfluxDB: Introduce custom variable support.
  * Gops: Add tracking for data source check.
  * AzureMonitor: Prometheus exemplars support .
  * Feature Management: Move awsDatasourcesNewFormStyling to GA.
  * TimeRangePicker: Announce to screen reader when time range is
    updated.
  * Alerting: Template selector in contact points form.
  * Azure: Load custom clouds from ini file.
  * Loki: Kick start your query now applies templates to the current
    query.
  * Elasticsearch: Queries no longer executed while typing.
  * Alerting: Add options to configure TLS for HA using Redis.-g
  * VizLegend: Represent line style in series legend and tooltip.
  * FeatureBadge: Update FeatureBadge to support current release
    stages.
  * Logs: Infinite scrolling in Explore enabled by default.
  * Plugins: Improve frontend loader cache.
  * Chore: Upgrade go from 1.21.0 to 1.21.10.
  * Chore: Upgrade go to 1.22.3.
  * Team: Add an endpoint for bulk team membership updates.
  * Flamegraph: Add collapse and expand group buttons to toolbar.
  * OIDC: Support Generic OAuth org to role mappings.
  * Search: Announce to screen reader when query returns no result.
  * Logs: Added support for numeric log levels.
  * Prometheus: Place custom inputs first when using regex filter
    values in the query builder.
  * Alerting: Remove requirement for datasource query on rule read.
  * Alerting: Add RBAC logic for silences creation.
  * Alerting: Update silences creation to support __alert_rule_uid__
    and move into drawer.
  * Flamegraph: Add diff mode color legend.
  * Dashboard: Keyboard and mouse panel shortcuts improvement.
  * PanelHeaderCorner: Remove font-awesome icons.-89
  * Alerting: Add OAuth2 to HTTP settings for vanilla Alertmanager /
    Mimir.
  * Plugins: Allow apps to expose components. Update the extensions
    API.
  * Plugins: Catalog to show all plugins by default.
  * Prometheus: Ensure values in metric selector are visible.
  * Select: Add data-testid to Input.-89
  * Prometheus: Add native histogram types metric explorer to allow
    filter by type.
  * Prometheus: Add hints for native histograms.
  * Alerting: Reduce number of request fetching rules in the
    dashboard view using rtkq.
  * Plugins: Make grafana-com API URL usage consistent.
  * Stack: Add size props.-89
  * Table Panel: Enable Text Wrapping.
  * Alerting: Get grafana-managed alert rule by UID.-g
  * Cloudwatch: Add Kendra metrics.
  * Auth: Added support to filter for parent teams in GitHub
    connector's team membership filter.-nihal
  * Alerting: Hook up GMA silence APIs to new authentication
    handler.
  * GeoMap: Pan and zoom keyboard support.
  * Alerting: Optimize rule status gathering APIs when a limit is
    applied.
  * Plugins: Add an auto-generated part to the plugin.json schema.
  * Loki/Prometheus Query Editor: Disabled cmd/ctrl+f keybinding
    within the editor.
  * Grafana packages: Remove E2E workspace.
  * RefreshPicker: Change running state to be less distracting .
  * Prometheus: Cancellable label values requests.
  * SQLStore: Improve recursive CTE support detection.
  * CloudMonitoring: Ensure variables can be used in all variable
    queries.
  * Common labels/displayed fields: Show label names with values.
  * AuthZ: Further protect admin endpoints.
  * Explore: Deprecate local storage singular datasource key.
  * Loki: Add label filters after label_format if present.
  * Alerting: Immutable plugin rules and alerting plugins
    extensions.
  * Tempo: Group by template vars.-grafana
  * Short Links: Add setting for changing expiration time.
  * Prometheus: Add native histogram functions.
  * Plugins: Removed feature toggle
    pluginsDynamicAngularDetectionPatterns.
  * Plugins: Removed feature toggle enablePluginsTracingByDefault.
  * Tracing: Allow otel service name and attributes to be overridden
    from env.
  * PanelChrome: Improve accessibility landmark markup.
  * Gops: Add configuration tracker on the existing IRM page.
  * CloudWatch: Add additional Glue metrics.
  * CloudWatch: Add labels for Metric Query type queries.
  * Util: Support parsing and splitting strings enclosed in quotes
    in util.SplitString.
  * Loki: Handle X-Scope-OrgID and tenant IDs.-grafana
  * CloudWatch: Add a Performance Insights and other missing metrics
    to aws/rds.
  * Prometheus: Respect dashboard queries when querying ad hoc
    filter labels.
  * Pyroscope: Add adhoc filters support.
  * Table Panel: Update background colors to respect transparency.
  * Canvas: Add support for line animation.-almasan
  * Reducers: Add in basic Percentile Support.
  * Storage: Watch tests.
  * Plugins: Show update buttons when instance version is different.
  * Tempo: Always use time range even if timeShiftEnabled is false.
  * Alerting: Gops labels integration.
  * Explore: Set X-Cache-Skip to true for query requests.
  * Explore: Make Explore breadcrumb clickable.
  * Prometheus: Fuzzy search for metric names in Code Mode.
  * Storage Api: Adds traces.
  * Storage Api: Add metrics.
  * Alerting: Improve paused alert visibility and allow
    pausing/resuming from alert list view.
  * CloudWatch: Clarify match exact tooltip and docs.
  * Alerting: Evaluation quick buttons.
  * Alerting: Add state history polling interval.
  * CloudWatch: Improve metric label parsing.
  * Alerting: Improve template preview.
  * Alerting: New settings page.
  * Explore: Move Query History to be screen wide.
  * MixedDataSource: Support multi value data source variable that
    issues a query to each data source.
  * PluginExtensions: Make the extensions registry reactive.
  * Loki: Use label/<name>/values API instead of series API for
    label values discovery.-rs
  * Tempo: Escape backslash in span name for promsql query.
  * Alerting: Export and provisioning rules into subfolders.
  Bug fixes:
  * Alerting: Fix go-swagger extraction and several embedded types
    from Alertmanager in Swagger docs.
  * DashboardScene: Fixes inspect with transforms issue.
  * Elasticsearch: Fix stripping of trailing slashes in datasource
    URLs.
  * Loki: Fix editor history in wrong order.
  * Cli: Fix bug where password is hashed twice.
  * AzureMonitor: Fix bug detecting app insights queries.
  * SSE: Fix threshold unmarshal to avoid panic.-tceretian
  * Dashboard: Fix Variables query hides fields with non-supported
    datasources.
  * Explore: Align time filters properly to day boundaries in query
    history.
  * Access Control: Clean up permissions for deprovisioned data
    sources.
  * Dashboards: Correctly display Admin access to dashboards in the
    UI.
  * LibraryPanels/RBAC: Ignore old folder permission check when
    deleting/patching lib panel.
  * LogsTable: Fix default sort by time.
  * Dashboards: Fix regression when deleting folder.
  * Docker: Fix renderer plugin in custom Dockerfile.
  * Alerting: Fix rules deleting when reordering whilst filtered.
  * Alerting: Fix "copy link" not including full URL.
  * Alerting: Fix typo in JSON response for rule export.-tceretian
  * Alerting: Fix scheduler to sort rules before
    evaluation.-tceretian
  * CloudMonitoring: Fix query type selection issue.
  * Alerting: Assume built-in AM is receiving alerts in case of not
    having admin config.
  * DashboardScene: Skip panel repeats when values are the same.
  * Alerting: Fix deleting rules when silencing/resuming rule from a
    panel alert tab.
  * Dashboards: Don't set dashboard creator/updater if the action is
    done by an API key.
  * Elasticsearch: Fix setting of default
    maxConcurrentShardRequests.
  * Graphite: Fix alignment of elements in the query editor.
  * DashboardScene: Fixing major row repeat issues.
  * Alerting: Do not store series values from past evaluations in
    state manager for no reason.
  * RBAC: Update role picker in team page, fix a bug with roles
    being removed upon team setting update.
  * Transformations: Fix true inner join in joinByField
    transformation.
  * Alerting: Do not retry rule evaluations with "input data must be
    a wide series but got type long" style errors.
  * Tempo: Fix sorting for nested tables.-grafana
  * Cloudwatch Logs: Fix bug where we did not return errors to user.
  * CloudWatch: Fix apostrophes in dimension values not being
    escaped.
  * AnnotationList: Fix link for annotation with no panel or
    dashboard.
  * Graphite: Fix splitting expressions in tag_value with template
    variables.
  * SQL Query Editor: Fix label-for IDs, associate "Table" label.
  * SSO: Add SSO settings to secrets migrator.
  * Plugins: Preserve trailing slash in plugin proxy.
  * TimeSeries: Improve keyboard focus and fix spacebar override.
  * NodeGraph: Use values from fixedX/fixedY column for layout.
  * Alerting: Prevent simplified routing zero duration GroupInterval
    and RepeatInterval.
  * Loki: Fix setting of tenant ID.-grafana
  * DashboardScene: Fixes checkbox orienation in save forms.
  * CloudMonitoring: Correctly interpolate multi-valued template
    variables in PromQL queries.
  * Expressions: Fix erroneous sorting of metrics and expressions.
  * CloudMonitoring: Allow a custom group by value.
  * DataLinks: Fixes datalinks with onClick and variables in url not
    being interpolated .
  * I18N: Fix untranslated descriptions in data source picker.
  * RBAC: Fix global role deletion in hosted Grafana.
  * Expression: Fix a bug of the display name of the threshold
    expression result.
  * Alerting: Fix incorrect display of pending period in alert rule
    form.
  * Alerting: Fix redirect after saving a notification template.
  * Alerting: Get oncall metada only when we have alert manager
    configuration data.
  * Alerting: Return better error for invalid time range on alert
    queries.
  * CloudWatch: Fix SageMaker MBP namespace typo.
  * Alerting: Only append /alertmanager when sending alerts to mimir
    targets if not already present.
  * Alerting: Set mimir implementation in jsonData by default when
    creating a new a….
  * Alerting: Persist silence state immediately on Create/Delete .
  * NodeGraph: Fix configuring arc colors with mixed case field
    names.
  Breaking changes:
  * Users that provision alert rules into folders whose titles
    contain slashes from now on they should escape them: eg. if an
    alert group contains `folder: folder_with_/_in_title` it
    should become `folder: folder_with_\/_in_title Issue`.
  Deprecations:
  * The grafana.explore.richHistory.activeDatasourceOnly local
    storage key is deprecated, and will be removed in Grafana 12.
    You may experience loss of your Explore query history or
    autocomplete data if you upgrade to Grafana 12 under 2 weeks of
    Grafana 11.1. Actual risk of data loss depends on your query
    history retention policy. Issue
  Plugin development fixes & changes:
  * Select: Change Select group headers to always be visible.
  * Select: Ensure virtualised menu scrolls active option into view
    when using arrow keys.
  * Switch: Improve disabled active state.
  * Button: Allow disabled button to still be focused.
  * GrafanaUI: Add tabular prop to Text component for tabular
    numbers.
- Update to version 11.0.0
  Features and enhancements:
  * Alerting: Add two sets of provisioning actions for rules and
    notifications .
  * Chore: Upgrade go to 1.21.10.
  * Auth: Force lowercase login/email for users.
  * Navigation: Add a return to previous button when navigating to
    different sections.
  * DashboardScene: Move add library panel view from grid item to
    drawer.
  * CloudWatch : Add missing AWS/ES metrics.
  * Alerting: Reduce set of fields that could trigger alert state
    change.
  * OAuth: Make sub claim required for generic oauth behind feature
    toggle.
  * Grafana E2E: Add deprecation notice and update docs.
  * Loki: Remove API restrictions on resource calls.
  Bug fixes:
  * AuthN: Fix signout redirect url.
  * CloudMonitoring: Improve legacy query migrations.
  * Azure data sources: Set selected config type before save.
  * Loki: Fix log context when no label types are present.
  * DashboardScene: Fixes editing transformations after toggling
    table view.
  * DashboardDataSource: Fixes issue where sometimes untransformed
    data could be returned .
  * Provisioning: Look up provisioned folders by UID when possible.
  * Cloudwatch: Update grafana-aws-sdk to fix sts endpoints.
  * Select: Fixes issue preserving search term (input) when
    selecting a value.
  * Alerting: Prevent search from locking the browser.
  * DashboardScene: Fixes issue referring to library panel in
    dashboard data source .
  * Data source: Maintain the default data source permissions when
    switching from unlicensed to licensed Grafana.
  * Alerting: Allow deleting contact points referenced only by
    auto-generated policies.
  * Auth: Sign sigV4 request after adding headers.
  * DashboardScene: Fixes issues with relative time range in panel
    edit.
  * DashboardScene: Fixes issue with dashboard links and variables.
  * SQLStore: Disable redundant create and drop unique index
    migrations on dashboard table.
  * LogContext: Fix structured metadata labels being added as stream
    selectors.
  * DashboardScene: Fixes issue with editing panels that uses
    instanceState.
  * DashboardScene: Fixes deleting dirty dashboard.
  * Alerting: Take receivers into account when custom grouping
    Alertmanager groups.
  * LDAP: Fix listing all non-matching groups.
  * Alerting: Fix simplified routing group by override.
  * NodeGraph: Fix invisible arrow tips in Editor.
  * Dashboard: DashboardPageProxy - Use chaining operators to
    prevent runtime error.
  * Cli: Check missing plugin parameter of plugin update command.
  * DashboardScene: Fixes issue saving new dashboard from panel
    edit.
  * DashboardScene: Fixes minor issue transitioning between
    dashboards.
  * MSSQL: Add SQL_VARIANT converter and update test.
  * DashboardScene: Fixes react panels with old angular options.
  * Alerting: Fix simplified routes '...' groupBy creating invalid
    routes.
  * AWS DataSource: Fix namespaces in sagemaker metrics.
  * DashboardScene: Fixes saving dashboard with angular panels .
  * DashboardScene: Fix empty row repeat issue.
  * Nodegraph: Fix issue with rendering single node.
  * Datasources: Add fixed width to name field in config editor.
  * Alerting: Return a 400 and errutil error when trying to delete a
    contact point that is referenced by a policy.
  * Table Panel: Fix image disappearing when datalinks applied.
  * LibraryPanelRBAC: Fix issue with importing dashboards containing
    library panels.
  * DashboardScene: Fixes issue moving between dashboards.
  * Alerting: Fix evaluation metrics to not count retries.
  * Google Cloud Monitor: Fix interface conversion for incorrect
    type in cloudMonitoringProm.run.
  * Dashboard: Allow auto refresh option when saving a dashboard.
  * Time Zones: Fix relative time when using UTC timezone.
  * PostgreSQL: Fix the verify-ca mode.
  * DashboardScene: Fixes issue with mobile responsive layout due to
    repeated grid item class.
  * DashboardScene: Fixes panel edit issue with clearing title not
    resulting in hover header mode .
  * Angular deprecation: Prefer local "angularDetected" value to the
    remote one.
  * Chore: Fix trailing spaces in prometheus min step.
  * Breaking changes:
  * The @grafana/e2e package is deprecated in Grafana 11.0.0. If
    your Grafana plugin has end-to-end tests that use @grafana/e2e,
    it's recommended to replace them with @grafana/plugin-e2e and
    Playwright. For information on how to migrate, please refer to
    the plugin-e2e docs. Issue
  Plugin development fixes & changes:
  * DateTimePicker: Alternate timezones now behave correctly.
  * TimeOfDayPicker: Fix text colours in light mode.

OBS-URL: https://build.opensuse.org/request/show/1217348
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=134
 2024-10-28 12:10:34 +00:00
12 changed files with 2473 additions and 3136 deletions
Expand all files Collapse all files

7
0001-Add-source-code-reference.patch
View File

@@ -1,8 +1,3 @@
From 3dd318d8ddc8db3f84020c448e283620cc5d09ac Mon Sep 17 00:00:00 2001
From: Marius Kittler <mkittler@suse.de>
Date: Mon, 6 Feb 2023 13:51:31 +0100
Subject: [PATCH] Add source code reference
---
public/app/core/components/Footer/Footer.tsx | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
@@ -29,7 +24,7 @@ index c73c2ea53..829700096 100644
+ id: 'updateVersion',
+ text: `Source code`,
+ icon: 'download-alt',
+ url: 'https://build.opensuse.org/package/show/openSUSE:Factory/grafana',
+ url: 'https://build.opensuse.org/package/show/server:monitoring:SLE/grafana',
+ });
return links;

467
0002-Fix-msagl-and-remove-esfx.patch Normal file
View File

@@ -0,0 +1,467 @@
Index: grafana-10.4.11/.drone.yml
===================================================================
--- grafana-10.4.11.orig/.drone.yml
+++ grafana-10.4.11/.drone.yml
@@ -115,7 +115,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -217,7 +216,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -530,7 +528,6 @@ steps:
image: golang:1.22.7-alpine
name: wire-install
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1050,7 +1047,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1403,7 +1399,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1480,7 +1475,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1539,7 +1533,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1803,7 +1796,6 @@ steps:
image: golang:1.22.7-alpine
name: wire-install
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -2903,7 +2895,6 @@ steps:
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -3735,7 +3726,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
Index: grafana-10.4.11/package.json
===================================================================
--- grafana-10.4.11.orig/package.json
+++ grafana-10.4.11/package.json
@@ -259,8 +259,8 @@
"@locker/near-membrane-dom": "0.13.6",
"@locker/near-membrane-shared": "0.13.6",
"@locker/near-membrane-shared-dom": "0.13.6",
- "@msagl/core": "^1.1.16",
- "@msagl/parser": "^1.1.16",
+ "@msagl/core": "^1.1.19",
+ "@msagl/parser": "^1.1.19",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/exporter-collector": "0.25.0",
"@opentelemetry/semantic-conventions": "1.21.0",
Index: grafana-10.4.11/scripts/drone/steps/lib.star
===================================================================
--- grafana-10.4.11.orig/scripts/drone/steps/lib.star
+++ grafana-10.4.11/scripts/drone/steps/lib.star
@@ -35,8 +35,6 @@ def yarn_install_step():
"name": "yarn-install",
"image": images["node"],
"commands": [
- # Python is needed to build `esfx`, which is needed by `msagl`
- "apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python",
"yarn install --immutable",
],
"depends_on": [],
Index: grafana-10.4.11/yarn.lock
===================================================================
--- grafana-10.4.11.orig/yarn.lock
+++ grafana-10.4.11/yarn.lock
@@ -2932,98 +2932,6 @@ __metadata:
languageName: node
linkType: hard
-"@esfx/collection-core@npm:^1.0.0":
- version: 1.0.0
- resolution: "@esfx/collection-core@npm:1.0.0"
- checksum: 10/7e26d89953a201a6c965af18516e48ea0628ca2674c56c51368d61a3dc47b7d47b05984dc2392fecbbda4bb7134e735da0a01445818dd843a2b54e5b2010b4a2
- languageName: node
- linkType: hard
-
-"@esfx/collections-hashmap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-hashmap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/caef6a231ad6bb9aee06cce1a5da4918c07868be9732c96cf268762d1e7cf06365409d59c2e4d47acd3ad81022a5e552f6c1b75660ecdb2eb68265b70f67749d
- languageName: node
- linkType: hard
-
-"@esfx/collections-hashset@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-hashset@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/75250e1682f42af85ff5e6b837e02faf27977515f52551857fcb28854025bc02d019801f062b92eef25b1781d1686453cb18726fa1468ed1c41eabe517860a4f
- languageName: node
- linkType: hard
-
-"@esfx/collections-linkedlist@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-linkedlist@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/ddaafab0d90a8588b4292639e194217dfa5403fe4e6acc375b235ba1736a69dd43893b507f9c4aaae04377d66b23a1da0bee063be578940a03124cf0a6372096
- languageName: node
- linkType: hard
-
-"@esfx/collections-multimap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-multimap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/collections-hashmap": "npm:^1.0.2"
- "@esfx/collections-hashset": "npm:^1.0.2"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/ba6aebb8c737d9f6d9c6a06edd6904bf731c0e0eddc4aaa1fd67cf074f04441c368feee7a37af7dcab658602959d75002cc314283accf37dc1789c7a81d65914
- languageName: node
- linkType: hard
-
-"@esfx/collections-sortedmap@npm:^1.0.0, @esfx/collections-sortedmap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-sortedmap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/428f752583b5fa78e57137952f4925ca8f54daa3816a34b699adcf2206e816f3771c0bf7cfcbeafcf36e4036df200ab90bd7e6d1067bc7dc04e1dcc10f24706a
- languageName: node
- linkType: hard
-
-"@esfx/collections-sortedset@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-sortedset@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/3f0f1fac9a861bcad3965ffa23b9519b92b6aa54bd163e72a4220cc699a7a0f8fa120deb05152fdc3a2071bd543103fe0de74760e5ce3366e3b79874b2749b1d
- languageName: node
- linkType: hard
-
-"@esfx/collections@npm:^1.0.0":
- version: 1.0.2
- resolution: "@esfx/collections@npm:1.0.2"
- dependencies:
- "@esfx/collections-hashmap": "npm:^1.0.2"
- "@esfx/collections-hashset": "npm:^1.0.2"
- "@esfx/collections-linkedlist": "npm:^1.0.2"
- "@esfx/collections-multimap": "npm:^1.0.2"
- "@esfx/collections-sortedmap": "npm:^1.0.2"
- "@esfx/collections-sortedset": "npm:^1.0.2"
- checksum: 10/3f7f8d908e0e4c7ec31f48b5f52a44d3ba00fa74dc20aa2fdb811a69612ff477b2c96a288970a29073c8a7281d1cdda58614272dd1ce7d2a88305a5f98b33f9f
- languageName: node
- linkType: hard
-
-"@esfx/equatable@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/equatable@npm:1.0.2"
- dependencies:
- "@mapbox/node-pre-gyp": "npm:^1.0.9"
- checksum: 10/54e9de6092116699fb206676c5afd7b513e7b3e3fa03d08b8ee84a6f3b4d0057346606ceb2745f47cb1e73be28e77ca3fa403f1dcc66151a1f7a2e9cb48f7df3
- languageName: node
- linkType: hard
-
"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
version: 4.4.0
resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -5192,25 +5100,6 @@ __metadata:
languageName: node
linkType: hard
-"@mapbox/node-pre-gyp@npm:^1.0.9":
- version: 1.0.11
- resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
- dependencies:
- detect-libc: "npm:^2.0.0"
- https-proxy-agent: "npm:^5.0.0"
- make-dir: "npm:^3.1.0"
- node-fetch: "npm:^2.6.7"
- nopt: "npm:^5.0.0"
- npmlog: "npm:^5.0.1"
- rimraf: "npm:^3.0.2"
- semver: "npm:^7.3.5"
- tar: "npm:^6.1.11"
- bin:
- node-pre-gyp: bin/node-pre-gyp
- checksum: 10/59529a2444e44fddb63057152452b00705aa58059079191126c79ac1388ae4565625afa84ed4dd1bf017d1111ab6e47907f7c5192e06d83c9496f2f3e708680a
- languageName: node
- linkType: hard
-
"@mapbox/point-geometry@npm:^0.1.0":
version: 0.1.0
resolution: "@mapbox/point-geometry@npm:0.1.0"
@@ -5270,39 +5159,38 @@ __metadata:
languageName: node
linkType: hard
-"@msagl/core@npm:^1.1.16, @msagl/core@npm:^1.1.17":
- version: 1.1.17
- resolution: "@msagl/core@npm:1.1.17"
+"@msagl/core@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/core@npm:1.1.19"
dependencies:
- "@esfx/collections": "npm:^1.0.0"
- "@esfx/collections-sortedmap": "npm:^1.0.0"
+ linked-list-typed: "npm:^1.52.0"
queue-typescript: "npm:^1.0.1"
reliable-random: "npm:^0.0.1"
stack-typescript: "npm:^1.0.4"
typescript-string-operations: "npm:^1.4.1"
- checksum: 10/6a0c83911d0802cf4372a9d976017117d9ecbec8e8bda8850fb58dec76558c0453290a51ad1c55b451ae70deeb3a57b1623bcbf7d054b3bfdacb9ea2a8190d5a
+ checksum: 10/33536bb2ea00215010078faab2211af8be7bcab9e6067f035bed043ae21196bce98364ed554b97552b4cb674ae6c7c65e7f426a4f8cff7b4353c6d23968f1688
languageName: node
linkType: hard
-"@msagl/drawing@npm:^1.1.17":
- version: 1.1.17
- resolution: "@msagl/drawing@npm:1.1.17"
+"@msagl/drawing@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/drawing@npm:1.1.19"
dependencies:
- "@msagl/core": "npm:^1.1.17"
- checksum: 10/7a3f38cf2cafeda292cbd7c3f78d55f39f11a5923c3675ecd5a51d362660461fca50b42e5c9aa58431ad34f650fff0443be99670947c6fcd6f07701057a08c52
+ "@msagl/core": "npm:^1.1.19"
+ checksum: 10/b8963ab6f8dd7943a10d950abe11030996e12cd74503c6d704678dce54c1fd0f5ee1570cc893027e24150e475294d09a4ae4ac3be8f9e9f8d7382d7b7c5303a9
languageName: node
linkType: hard
-"@msagl/parser@npm:^1.1.16":
- version: 1.1.17
- resolution: "@msagl/parser@npm:1.1.17"
+"@msagl/parser@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/parser@npm:1.1.19"
dependencies:
- "@msagl/core": "npm:^1.1.17"
- "@msagl/drawing": "npm:^1.1.17"
+ "@msagl/core": "npm:^1.1.19"
+ "@msagl/drawing": "npm:^1.1.19"
"@types/parse-color": "npm:^1.0.1"
dotparser: "npm:^1.1.1"
parse-color: "npm:^1.0.0"
- checksum: 10/eae9c0a02410177b9c8f73edcad3c9e4610a31a972b3c58a870fe1db7c75b857304a87b82e8b7f9d6afedf91be73969856626ebb0f3fdae0d47c4e62da805ca1
+ checksum: 10/349dcd57a3365628699b45172359363b86a1b27f8300b5b7fde97ba65eb512191a7433b72908a544fbbdc1d91bcaa9ca498faef345078367529820a47af38609
languageName: node
linkType: hard
@@ -11618,16 +11506,6 @@ __metadata:
languageName: node
linkType: hard
-"are-we-there-yet@npm:^2.0.0":
- version: 2.0.0
- resolution: "are-we-there-yet@npm:2.0.0"
- dependencies:
- delegates: "npm:^1.0.0"
- readable-stream: "npm:^3.6.0"
- checksum: 10/ea6f47d14fc33ae9cbea3e686eeca021d9d7b9db83a306010dd04ad5f2c8b7675291b127d3fcbfcbd8fec26e47b3324ad5b469a6cc3733a582f2fe4e12fc6756
- languageName: node
- linkType: hard
-
"are-we-there-yet@npm:^3.0.0":
version: 3.0.0
resolution: "are-we-there-yet@npm:3.0.0"
@@ -13383,7 +13261,7 @@ __metadata:
languageName: node
linkType: hard
-"color-support@npm:^1.1.2, color-support@npm:^1.1.3":
+"color-support@npm:^1.1.3":
version: 1.1.3
resolution: "color-support@npm:1.1.3"
bin:
@@ -14874,6 +14752,13 @@ __metadata:
languageName: node
linkType: hard
+"data-structure-typed@npm:^1.52.0":
+ version: 1.52.0
+ resolution: "data-structure-typed@npm:1.52.0"
+ checksum: 10/9adddcbd0aae44311e866ac093c353fe7f092c19216152329261ea85b5e5e33413ec0605d4766c2ed2939d0b5d1a41576f8c0d21c5c6fe407a7bbdd9b2b2f159
+ languageName: node
+ linkType: hard
+
"data-urls@npm:^3.0.2":
version: 3.0.2
resolution: "data-urls@npm:3.0.2"
@@ -15219,13 +15104,6 @@ __metadata:
languageName: node
linkType: hard
-"detect-libc@npm:^2.0.0":
- version: 2.0.2
- resolution: "detect-libc@npm:2.0.2"
- checksum: 10/6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8
- languageName: node
- linkType: hard
-
"detect-newline@npm:^3.0.0":
version: 3.1.0
resolution: "detect-newline@npm:3.1.0"
@@ -17784,23 +17662,6 @@ __metadata:
languageName: node
linkType: hard
-"gauge@npm:^3.0.0":
- version: 3.0.2
- resolution: "gauge@npm:3.0.2"
- dependencies:
- aproba: "npm:^1.0.3 || ^2.0.0"
- color-support: "npm:^1.1.2"
- console-control-strings: "npm:^1.0.0"
- has-unicode: "npm:^2.0.1"
- object-assign: "npm:^4.1.1"
- signal-exit: "npm:^3.0.0"
- string-width: "npm:^4.2.3"
- strip-ansi: "npm:^6.0.1"
- wide-align: "npm:^1.1.2"
- checksum: 10/46df086451672a5fecd58f7ec86da74542c795f8e00153fbef2884286ce0e86653c3eb23be2d0abb0c4a82b9b2a9dec3b09b6a1cf31c28085fa0376599a26589
- languageName: node
- linkType: hard
-
"gauge@npm:^4.0.3":
version: 4.0.4
resolution: "gauge@npm:4.0.4"
@@ -18415,8 +18276,8 @@ __metadata:
"@locker/near-membrane-dom": "npm:0.13.6"
"@locker/near-membrane-shared": "npm:0.13.6"
"@locker/near-membrane-shared-dom": "npm:0.13.6"
- "@msagl/core": "npm:^1.1.16"
- "@msagl/parser": "npm:^1.1.16"
+ "@msagl/core": "npm:^1.1.19"
+ "@msagl/parser": "npm:^1.1.19"
"@opentelemetry/api": "npm:1.7.0"
"@opentelemetry/exporter-collector": "npm:0.25.0"
"@opentelemetry/semantic-conventions": "npm:1.21.0"
@@ -21782,6 +21643,15 @@ __metadata:
languageName: node
linkType: hard
+"linked-list-typed@npm:^1.52.0":
+ version: 1.52.0
+ resolution: "linked-list-typed@npm:1.52.0"
+ dependencies:
+ data-structure-typed: "npm:^1.52.0"
+ checksum: 10/8d378c1691f0fa6b3c045784510bc1bfea2cb4d9f51decccc321e39680e031352580423c84aa0b862bbea829db53a046a3f7752b82a83020c640d47c2b433994
+ languageName: node
+ linkType: hard
+
"linked-list-typescript@npm:^1.0.11":
version: 1.0.15
resolution: "linked-list-typescript@npm:1.0.15"
@@ -22185,7 +22055,7 @@ __metadata:
languageName: node
linkType: hard
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
+"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
version: 3.1.0
resolution: "make-dir@npm:3.1.0"
dependencies:
@@ -23632,18 +23502,6 @@ __metadata:
languageName: node
linkType: hard
-"npmlog@npm:^5.0.1":
- version: 5.0.1
- resolution: "npmlog@npm:5.0.1"
- dependencies:
- are-we-there-yet: "npm:^2.0.0"
- console-control-strings: "npm:^1.1.0"
- gauge: "npm:^3.0.0"
- set-blocking: "npm:^2.0.0"
- checksum: 10/f42c7b9584cdd26a13c41a21930b6f5912896b6419ab15be88cc5721fc792f1c3dd30eb602b26ae08575694628ba70afdcf3675d86e4f450fc544757e52726ec
- languageName: node
- linkType: hard
-
"npmlog@npm:^6.0.0, npmlog@npm:^6.0.2":
version: 6.0.2
resolution: "npmlog@npm:6.0.2"
@@ -30333,9 +30191,9 @@ __metadata:
linkType: hard
"typescript-string-operations@npm:^1.4.1":
- version: 1.5.0
- resolution: "typescript-string-operations@npm:1.5.0"
- checksum: 10/a884c4241fc45b9cceb2744c20fb229e6dfcb48f96afd68ef2d67fda1e4586c96d20fd0343b57c14ac33b2ebe000aa7524a4932424aea3077fe9e692555384f2
+ version: 1.5.1
+ resolution: "typescript-string-operations@npm:1.5.1"
+ checksum: 10/cec5ad55922ff6e5fc9f43bd7cdcbbb4049bf7b69b18d0ff508b7227519b4da2ce1873b913760b3bf12651833b67d314e0c1c8cee26a25cc0e138335e34bb250
languageName: node
linkType: hard
@@ -31614,7 +31472,7 @@ __metadata:
languageName: node
linkType: hard
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
+"wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
version: 1.1.5
resolution: "wide-align@npm:1.1.5"
dependencies:
Index: grafana-10.4.11/.yarnrc.yml
===================================================================
--- grafana-10.4.11.orig/.yarnrc.yml
+++ grafana-10.4.11/.yarnrc.yml
@@ -33,10 +33,6 @@ packageExtensions:
react-resizable@3.0.4:
peerDependencies:
react-dom: 17.0.1
- '@msagl/drawing@*':
- dependencies:
- queue-typescript: "^1.0.1"
- "@esfx/collections-sortedmap": "^1.0.0"
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs

30
0003-Use-bash-instead-of-env.patch Normal file
View File

@@ -0,0 +1,30 @@
Index: grafana-11.3.0/packaging/wrappers/grafana
===================================================================
--- grafana-11.3.0.orig/packaging/wrappers/grafana
+++ grafana-11.3.0/packaging/wrappers/grafana
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/bash
# Wrapper for the grafana binary
# This file serves as a wrapper for the grafana binary. It ensures we set
Index: grafana-11.3.0/packaging/wrappers/grafana-cli
===================================================================
--- grafana-11.3.0.orig/packaging/wrappers/grafana-cli
+++ grafana-11.3.0/packaging/wrappers/grafana-cli
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/bash
# Wrapper for the grafana binary
# This file serves as a wrapper for the grafana binary. It ensures we set
Index: grafana-11.3.0/packaging/wrappers/grafana-server
===================================================================
--- grafana-11.3.0.orig/packaging/wrappers/grafana-server
+++ grafana-11.3.0/packaging/wrappers/grafana-server
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/bash
# Wrapper for the grafana binary
# This file serves as a wrapper for the grafana binary. It ensures we set

177
0004-Bump-crypto.patch Normal file
View File

@@ -0,0 +1,177 @@
diff --git a/go.mod b/go.mod
index 7a97708abdf..fcb5afe686d 100644
--- a/go.mod
+++ b/go.mod
@@ -98,11 +98,11 @@ require (
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // @grafana/backend-platform
go.opentelemetry.io/otel/sdk v1.28.0 // @grafana/backend-platform
go.opentelemetry.io/otel/trace v1.28.0 // @grafana/backend-platform
- golang.org/x/crypto v0.26.0 // @grafana/backend-platform
+ golang.org/x/crypto v0.32.0 // @grafana/backend-platform
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // @grafana/alerting-squad-backend
golang.org/x/net v0.28.0 // @grafana/oss-big-tent @grafana/partner-datasources
golang.org/x/oauth2 v0.22.0 // @grafana/grafana-authnz-team
- golang.org/x/sync v0.8.0 // @grafana/alerting-squad-backend
+ golang.org/x/sync v0.10.0 // @grafana/alerting-squad-backend
golang.org/x/time v0.5.0 // @grafana/backend-platform
golang.org/x/tools v0.24.0 // @grafana/grafana-as-code
gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics
@@ -207,8 +207,8 @@ require (
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.11.0 // @grafana/alerting-squad-backend
go.uber.org/goleak v1.3.0 // indirect
- golang.org/x/sys v0.24.0 // indirect
- golang.org/x/text v0.17.0 // @grafana/backend-platform
+ golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/text v0.21.0 // @grafana/backend-platform
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect; @grafana/backend-platform
@@ -380,7 +380,7 @@ require (
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
- golang.org/x/term v0.23.0 // indirect
+ golang.org/x/term v0.28.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
diff --git a/go.sum b/go.sum
index da1909d0601..7d9bf47843f 100644
--- a/go.sum
+++ b/go.sum
@@ -4032,6 +4032,8 @@ golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -4298,6 +4300,8 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -4473,6 +4477,8 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -4497,6 +4503,7 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -4522,6 +4529,8 @@ golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/pkg/build/go.mod b/pkg/build/go.mod
index e37fce973e5..7a638e39174 100644
--- a/pkg/build/go.mod
+++ b/pkg/build/go.mod
@@ -12,7 +12,6 @@ require (
dagger.io/dagger v0.11.9
github.com/Masterminds/semver/v3 v3.2.1
github.com/aws/aws-sdk-go v1.55.3
- github.com/blang/semver/v4 v4.0.0
github.com/docker/docker v1.13.1
github.com/drone/drone-cli v1.8.0
github.com/google/go-cmp v0.6.0
@@ -20,7 +19,7 @@ require (
github.com/google/go-github/v45 v45.2.0
github.com/stretchr/testify v1.9.0
github.com/urfave/cli v1.22.15
- github.com/urfave/cli/v2 v2.25.0
+ github.com/urfave/cli/v2 v2.27.1
golang.org/x/mod v0.17.0
golang.org/x/oauth2 v0.21.0
google.golang.org/api v0.189.0
@@ -89,12 +88,12 @@ require (
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
- golang.org/x/crypto v0.25.0 // indirect
+ golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.27.0 // indirect
- golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.22.0 // indirect
- golang.org/x/text v0.16.0 // indirect
+ golang.org/x/sync v0.10.0 // indirect
+ golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
diff --git a/pkg/build/go.sum b/pkg/build/go.sum
index 92ad8883ee4..874d4531bfc 100644
--- a/pkg/build/go.sum
+++ b/pkg/build/go.sum
@@ -39,8 +39,6 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E=
github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
-github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
-github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8=
@@ -257,8 +255,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
@@ -288,8 +286,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -301,13 +299,13 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

6
Makefile
View File

@@ -24,10 +24,14 @@ tar:
cd $$basename && \
# Patches for the JS frontend go after here \
patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch && \
patch --no-backup-if-mismatch -p1 -i ../../0002-Fix-msagl-and-remove-esfx.patch && \
# End patches section \
# Patches for Go modules go after here \
patch --no-backup-if-mismatch -p1 -i ../../0004-Bump-crypto.patch && \
# End of Go modules patches section \
go mod download && \
go mod verify && \
go mod vendor && \
go work vendor && \
tar --format=posix -cf ../../vendor.tar vendor && \
# avoid ".git can't be found" \
git init && \

3
_service
View File

@@ -5,8 +5,7 @@
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">v10.3.5</param>
<param name="changesgenerate">enable</param>
<param name="revision">v10.4.13</param>
</service>
<service name="recompress" mode="manual">
<param name="compression">gz</param>

2
_servicedata
View File

@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/grafana/grafana</param>
<param name="changesrevision">6db35ad6b4075cf214594fc62f4a3faa3484be01</param>
<param name="changesrevision">9ed35a1d6fe1222d5e054237db735b5bac5e3712</param>
</service>
</servicedata>

3
grafana-10.3.5.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:948098bb573e9bf1b788aaec813d71f6654a8d4fd8ef61e736fddfb9204fc6fa
size 77195322

BIN
grafana-10.4.13.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

4893
grafana.changes
View File

File diff suppressed because it is too large Load Diff

14
grafana.spec
View File

@@ -22,7 +22,7 @@
%endif
Name: grafana
Version: 10.3.5
Version: 10.4.13
Release: 0
Summary: The open-source platform for monitoring and observability
License: AGPL-3.0-only
@@ -36,10 +36,15 @@ Source3: README
# Makefile to automate build process
Source4: Makefile
Source5: 0001-Add-source-code-reference.patch
# https://github.com/grafana/grafana/issues/83318
Source6: 0002-Fix-msagl-and-remove-esfx.patch
Patch3: 0003-Use-bash-instead-of-env.patch
# CVE-2024-45337 Bump golang.org/x/crypto
Patch4: 0004-Bump-crypto.patch
BuildRequires: fdupes
BuildRequires: git-core
BuildRequires: wire
BuildRequires: golang(API) >= 1.21
BuildRequires: golang(API) = 1.22
Requires(post): %fillup_prereq
Requires: group(grafana)
Requires: user(grafana)
@@ -59,7 +64,7 @@ dashboards and data with teams.
%prep
%setup -q -n grafana-%{version}
%setup -q -T -D -a 1 -n grafana-%{version}
%autosetup -T -D -a 1 -p1 -n grafana-%{version}
%build
%ifnarch ppc64
@@ -68,9 +73,8 @@ export GOFLAGS="-buildmode=pie"
wire gen -tags 'oss' ./pkg/server
go build -o . -ldflags '-X main.version=%{version}' ./pkg/cmd/...
%install
# install binaries and service
%install
install -Dm755 %{name} %{buildroot}%{_libexecdir}/%{name}/%{name}
install -Dm755 %{name}-server %{buildroot}%{_libexecdir}/%{name}/%{name}-server
install -Dm755 %{name}-cli %{buildroot}%{_libexecdir}/%{name}/%{name}-cli

BIN
vendor.tar.gz (Stored with Git LFS)
View File

Binary file not shown.