pool/grafana
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1078603 from home:mkittler:branches:server:monitoring

Browse Source 
- Update to 9.4.7 (2023-03-16)
  * Bug fixes
    - Alerting: Update scheduler to receive rule updates only
      from database.
    - Influxdb: Re-introduce backend migration feature toggle.
    - Security: Fixes for CVE-2023-1410.
  * Breaking changes
    The InfluxDB backend migration feature toggle
    (influxdbBackendMigration) has been reintroduced in this
    version as issues were discovered with backend processing of
    InfluxDB data. Unless this feature toggle is enabled, all
    InfluxDB data will be parsed in the frontend. This frontend
    processing is the default behavior.
    In Grafana 9.4.4, InfluxDB data parsing started to be handled
    in the backend. If you have upgraded to 9.4.4 and then added
    new transformations on InfluxDB data, those panels will fail to
    render. To resolve this either:
    - Remove the affected panel and re-create it
    - Edit the `time` field as `Time` in `panel.json` or
      `dashboard.json`
- Remove 0002-Update-exporter-toolkit-to-version-0.7.3.patch
  as the exporter toolkit has been updated by upstream
- Install wrapper scripts under /usr/sbin
- Install actual binaries under /usr/libexec/grafana (or /usr/lib
  under older distributions) and create a simlink for wrapper
  scripts and the service (which expect the binary to be under
  /usr/share/grafana/bin)
- Update to 9.4.3 (2023-03-02)
  * Bug fixes
    - Alerting: Use background context for maintenance
      function.
- Update to 9.4.2 (2023-03-02)
  * Bug fixes
    - Alerting: Fix boolean default in migration from false to
      0.
- Update to 9.4.0 (2023-02-28)
  * Features and enhancements
    - Alerting: Add endpoint for querying state history.
    - Alerting: Add label query parameters to state history
      endpoint.
    - Alerting: Add static label to all state history entries.
    - Alerting: Mark AM configuration as applied.
    - Azure Monitor: Enable multiple resource queries.
    - InfluxDB: Move database information into jsondata.
    - Query Caching: Add per-panel query caching TTL.
    - Table: Add row number column option.
    - Tempo: Remove tempoApmTable feature flag.
    - Transformations: Selectively apply transformation to
      queries.
  * Bug fixes
    - AccessControl: Clear user permission cache for update org
      user role.
    - Alerting: Fix handling of special floating-point cases
      when writing observed values to annotations.
    - Auth: Rotate token patch.
    - ContextMenu: Consider y coord when determining bottom
      collision.
    - Elasticsearch: Fix consistent label order in alerting.
    - Explore: Fix graph not updating when changing config.
    - Heatmap: Support heatmap rows with non-timeseries X axis.
    - Login: Fix panic when a user is upserted by a background
      process.
    - MSSQL: Add support for macro function calls.
    - MySQL: Quote identifiers that include special characters.
    - Navigation: Sign in button now works correctly when
      served under a sub path.
    - Nested Folder: Fix for SQLite not to overwrite the parent
      on restarts.
    - PanelChrome: Adds display mode to support transparent
      option.
    - Plugins: Case-sensitive routes for standalone pages.
    - Plugins: Prefer to use the data source UID when querying.
    - SQLStore: Fix folder migration for MySQL < 5.7.
    - Search: Fix not being able to clear sort value.
    - Tempo: Fix span name being dropped from the query.
  * Plugin development fixes & changes
    - PanelChrome: Implement hover header.
- Update to 9.3.7 (2023-02-28)
  * Bug fixes
    - Alerting: Validate that tags are 100 characters or less.
    - Expressions: Fixes the issue showing expressions editor.
    - Logs: Fix stats not being updated when log results
      change.
    - Plugins: Fix circular reference in customOptions leading
      to MarshalJSON errors.
    - Time Series Panel: Fix legend text selection in Firefox.

OBS-URL: https://build.opensuse.org/request/show/1078603
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=101
This commit is contained in:
Witek Bedyk 2023-04-13 11:52:38 +00:00 committed by Git OBS Bridge
parent 68c74d7b9e
commit 159254a17b
9 changed files with 123 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0002-Update-exporter-toolkit-to-version-0.7.3.patch
View File

@ -1,39 +0,0 @@
From fe7cb5dac2c678145910f429c1ab26da58cf4d53 Mon Sep 17 00:00:00 2001
From: Marius Kittler <mkittler@suse.de>
Date: Fri, 17 Feb 2023 16:00:07 +0100
Subject: [PATCH] Update exporter-toolkit to version 0.7.3
---
go.mod | 2 +-
go.sum | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
index 680633de9..f38a4a16b 100644
--- a/go.mod
+++ b/go.mod
@@ -209,7 +209,7 @@ require (
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
- github.com/prometheus/exporter-toolkit v0.7.1 // indirect
+ github.com/prometheus/exporter-toolkit v0.7.3 // indirect
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
diff --git a/go.sum b/go.sum
index 58bf25e11..6d43b91ef 100644
--- a/go.sum
+++ b/go.sum
@@ -2150,6 +2150,8 @@ github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QY
github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y=
github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
+github.com/prometheus/exporter-toolkit v0.7.3 h1:IYBn0CTGi/nYxstdTUKysuSofUNJ3DQW3FmZ/Ub6rgU=
+github.com/prometheus/exporter-toolkit v0.7.3/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 h1:dTUS1vaLWq+Y6XKOTnrFpoVsQKLCbCp1OLj24TDi7oM=
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc=
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
--
2.39.1

1
Makefile
View File

@ -24,7 +24,6 @@ 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-Update-exporter-toolkit-to-version-0.7.3.patch && \
# End patches section \
go mod download && \
go mod verify && \

2
_service
View File

@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">v9.3.6</param>
<param name="revision">v9.4.7</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

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">978237e7cbe35c06d4be0e9c40670c64af2029eb</param>
<param name="changesrevision">4add91f03d3bf455b4eb8160c86c50030cbb823c</param>
</service>
</servicedata>

3
grafana-9.3.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22f72669d4e630f99273c520819e1416613e453e88c209ff386d8c09bd43c58b
size 61913800

3
grafana-9.4.7.tar.gz Normal file
View File

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

102
grafana.changes
View File

@ -1,3 +1,105 @@
-------------------------------------------------------------------
Thu Apr 6 15:03:14 UTC 2023 - Marius Kittler <marius.kittler@suse.com>
- Update to 9.4.7 (2023-03-16)
* Bug fixes
- Alerting: Update scheduler to receive rule updates only
from database.
- Influxdb: Re-introduce backend migration feature toggle.
- Security: Fixes for CVE-2023-1410.
* Breaking changes
The InfluxDB backend migration feature toggle
(influxdbBackendMigration) has been reintroduced in this
version as issues were discovered with backend processing of
InfluxDB data. Unless this feature toggle is enabled, all
InfluxDB data will be parsed in the frontend. This frontend
processing is the default behavior.
In Grafana 9.4.4, InfluxDB data parsing started to be handled
in the backend. If you have upgraded to 9.4.4 and then added
new transformations on InfluxDB data, those panels will fail to
render. To resolve this either:
- Remove the affected panel and re-create it
- Edit the `time` field as `Time` in `panel.json` or
`dashboard.json`
-------------------------------------------------------------------
Fri Mar 24 09:23:53 UTC 2023 - Marius Kittler <marius.kittler@suse.com>
- Remove 0002-Update-exporter-toolkit-to-version-0.7.3.patch
as the exporter toolkit has been updated by upstream
- Install wrapper scripts under /usr/sbin
- Install actual binaries under /usr/libexec/grafana (or /usr/lib
under older distributions) and create a simlink for wrapper
scripts and the service (which expect the binary to be under
/usr/share/grafana/bin)
-------------------------------------------------------------------
Fri Mar 3 15:10:17 UTC 2023 - Marius Kittler <marius.kittler@suse.com>
- Update to 9.4.3 (2023-03-02)
* Bug fixes
- Alerting: Use background context for maintenance
function.
- Update to 9.4.2 (2023-03-02)
* Bug fixes
- Alerting: Fix boolean default in migration from false to
0.
- Update to 9.4.0 (2023-02-28)
* Features and enhancements
- Alerting: Add endpoint for querying state history.
- Alerting: Add label query parameters to state history
endpoint.
- Alerting: Add static label to all state history entries.
- Alerting: Mark AM configuration as applied.
- Azure Monitor: Enable multiple resource queries.
- InfluxDB: Move database information into jsondata.
- Query Caching: Add per-panel query caching TTL.
- Table: Add row number column option.
- Tempo: Remove tempoApmTable feature flag.
- Transformations: Selectively apply transformation to
queries.
* Bug fixes
- AccessControl: Clear user permission cache for update org
user role.
- Alerting: Fix handling of special floating-point cases
when writing observed values to annotations.
- Auth: Rotate token patch.
- ContextMenu: Consider y coord when determining bottom
collision.
- Elasticsearch: Fix consistent label order in alerting.
- Explore: Fix graph not updating when changing config.
- Heatmap: Support heatmap rows with non-timeseries X axis.
- Login: Fix panic when a user is upserted by a background
process.
- MSSQL: Add support for macro function calls.
- MySQL: Quote identifiers that include special characters.
- Navigation: Sign in button now works correctly when
served under a sub path.
- Nested Folder: Fix for SQLite not to overwrite the parent
on restarts.
- PanelChrome: Adds display mode to support transparent
option.
- Plugins: Case-sensitive routes for standalone pages.
- Plugins: Prefer to use the data source UID when querying.
- SQLStore: Fix folder migration for MySQL < 5.7.
- Search: Fix not being able to clear sort value.
- Tempo: Fix span name being dropped from the query.
* Plugin development fixes & changes
- PanelChrome: Implement hover header.
- Update to 9.3.7 (2023-02-28)
* Bug fixes
- Alerting: Validate that tags are 100 characters or less.
- Expressions: Fixes the issue showing expressions editor.
- Logs: Fix stats not being updated when log results
change.
- Plugins: Fix circular reference in customOptions leading
to MarshalJSON errors.
- Time Series Panel: Fix legend text selection in Firefox.
-------------------------------------------------------------------
Mon Feb 16 16:45:00 UTC 2023 - marius.kittler@suse.com

18
grafana.spec
View File

@ -22,7 +22,7 @@
%endif
Name: grafana
Version: 9.3.6
Version: 9.4.7
Release: 0
Summary: The open-source platform for monitoring and observability
License: AGPL-3.0-only
@ -36,8 +36,6 @@ Source3: README
# Makefile to automate build process
Source4: Makefile
Source5: 0001-Add-source-code-reference.patch
# CVE-2022-46146 bsc#1208065
Patch0: 0002-Update-exporter-toolkit-to-version-0.7.3.patch
BuildRequires: fdupes
BuildRequires: git-core
BuildRequires: golang-packaging
@ -63,7 +61,6 @@ dashboards and data with teams.
%prep
%setup -q -n grafana-%{version}
%setup -q -T -D -a 1 -n grafana-%{version}
%patch0 -p1
%build
%goprep github.com/grafana/grafana
@ -83,10 +80,19 @@ go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd
%install
%goinstall
# install binaries and service
install -Dm644 {packaging/rpm/systemd/,%{buildroot}%{_unitdir}/}%{name}-server.service
install -dm755 %{buildroot}%{_sbindir}
install -dm755 %{buildroot}%{_libexecdir}/%{name}
install -m755 --target-directory=%{buildroot}%{_sbindir} packaging/wrappers/%{name}*
mv --target-directory=%{buildroot}%{_libexecdir}/%{name} %{buildroot}/%{_bindir}/%{name}*
# create "rc symlink" (https://en.opensuse.org/openSUSE:Systemd_packaging_guidelines#rc_symlink)
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server
mv %{buildroot}/%{_bindir}/grafana-* %{buildroot}/%{_sbindir}
# add symlink to binary where systemd unit file expects it to be
install -dm755 %{buildroot}%{_datadir}/%{name}/bin
ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_datadir}/%{name}/bin/%{name}
install -Dm644 packaging/rpm/sysconfig/%{name}-server \
%{buildroot}%{_fillupdir}/sysconfig.%{name}-server
@ -134,6 +140,8 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
%doc CHANGELOG*
%{_sbindir}/%{name}*
%{_sbindir}/rc%{name}-server
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/%{name}*
%{_unitdir}/%{name}-server.service
%{_fillupdir}/sysconfig.%{name}-server
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}

4
vendor.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13eb66fbc40d42ef0e8a5218657598d227d1d05ab3566c9b4e55198a7c450d47
size 21550631
oid sha256:a3192953e987c347d55624d352dee7fb1e568a295820d77ed5bce2a3b9702b50
size 24547879