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

Accepting request 849448 from home:STorresi:containers

Browse Source 
- Update packaging
  * avoid systemd and shadow hard requirements
  * Require the user from a new dedicated 'system-user-grafana' sibling package
  * avoid pinning to a specific Go version in the spec file

OBS-URL: https://build.opensuse.org/request/show/849448
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=48
This commit is contained in:
Witek Bedyk 2020-11-24 16:42:19 +00:00 committed by Git OBS Bridge
parent c2467c1e0d
commit 39d918083a
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
grafana.changes
View File

@ -1,9 +1,17 @@
-------------------------------------------------------------------
Mon Nov 9 16:50:36 UTC 2020 - Stefano Torresi <stefano.torresi@suse.com>
- Update packaging
* avoid systemd and shadow hard requirements
* Require the user from a new dedicated 'system-user-grafana' sibling package
* avoid pinning to a specific Go version in the spec file
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 05 12:21:57 UTC 2020 - witold.bedyk@suse.com Thu Nov 05 12:21:57 UTC 2020 - witold.bedyk@suse.com
- Update to version 7.3.1: - Update to version 7.3.1:
* Breaking changes * Breaking changes
- CloudWatch: The AWS CloudWatch data source's authentication scheme has changed. See the upgrade notes for details and how this may affect you. - CloudWatch: The AWS CloudWatch data source's authentication scheme has changed. See the upgrade notes for details and how this may affect you.
- Units: The date time units `YYYY-MM-DD HH:mm:ss` and `MM/DD/YYYY h:mm:ss a` have been renamed to `Datetime ISO` and `Datetime US` respectively. - Units: The date time units `YYYY-MM-DD HH:mm:ss` and `MM/DD/YYYY h:mm:ss a` have been renamed to `Datetime ISO` and `Datetime US` respectively.
* Features / Enhancements * Features / Enhancements
- AzureMonitor: Support decimal (as float64) type in analytics/logs. - AzureMonitor: Support decimal (as float64) type in analytics/logs.
@ -59,18 +67,18 @@ Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com
- Graph: Support setting field unit & override data source (automatic) unit. - Graph: Support setting field unit & override data source (automatic) unit.
- Explore: Unification of logs/metrics/traces user interface - Explore: Unification of logs/metrics/traces user interface
- Table: JSON Cell should try to convert strings to JSON - Table: JSON Cell should try to convert strings to JSON
- Variables: enables cancel for slow query variables queries. - Variables: enables cancel for slow query variables queries.
- TimeZone: unify the time zone pickers to one that can rule them all. - TimeZone: unify the time zone pickers to one that can rule them all.
- Search: support URL query params. - Search: support URL query params.
- Grafana-UI: Add FileUpload. - Grafana-UI: Add FileUpload.
- TablePanel: Sort numbers correctly. - TablePanel: Sort numbers correctly.
* Bug fixes * Bug fixes
- Alerting: remove LongToWide call in alerting. - Alerting: remove LongToWide call in alerting.
- AzureMonitor: fix panic introduced in 7.1.4 when unit was unspecified and alias was used. - AzureMonitor: fix panic introduced in 7.1.4 when unit was unspecified and alias was used.
- Variables: Fixes issue with All variable not being resolved. - Variables: Fixes issue with All variable not being resolved.
- Templating: Fixes so texts show in picker not the values. - Templating: Fixes so texts show in picker not the values.
- Templating: Templating: Fix undefined result when using raw interpolation format - Templating: Templating: Fix undefined result when using raw interpolation format
- TextPanel: Fix content overflowing panel boundaries. - TextPanel: Fix content overflowing panel boundaries.
- StatPanel: Fix stat panel display name not showing when explicitly set. - StatPanel: Fix stat panel display name not showing when explicitly set.
- Query history: Fix search filtering if null value. - Query history: Fix search filtering if null value.
- Flux: Ensure connections to InfluxDB are closed. - Flux: Ensure connections to InfluxDB are closed.
@ -87,7 +95,7 @@ Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com
- Datasources: Handle URL parsing error. - Datasources: Handle URL parsing error.
- Security: Use Header.Set and Header.Del for X-Grafana-User header. - Security: Use Header.Set and Header.Del for X-Grafana-User header.
* Changes in spec file * Changes in spec file
- Fix golang version = 1.14 to avoid dependency conflicts on some OBS projects - Fix golang version = 1.14 to avoid dependency conflicts on some OBS projects
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 05 10:31:13 UTC 2020 - jcavalheiro@suse.com Fri Jun 05 10:31:13 UTC 2020 - jcavalheiro@suse.com
@ -147,7 +155,7 @@ Mon Jun 01 13:12:54 UTC 2020 - jcavalheiro@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro <jcavalheiro@suse.com> Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro <jcavalheiro@suse.com>
- Update to version 7.0.0 - Update to version 7.0.0
* Breaking changes * Breaking changes
- Removed PhantomJS: PhantomJS was deprecated in Grafana v6.4 and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the Grafana Image Renderer plugin. - Removed PhantomJS: PhantomJS was deprecated in Grafana v6.4 and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the Grafana Image Renderer plugin.
- Dashboard: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds. - Dashboard: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds.
@ -202,7 +210,7 @@ Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro <jcavalheiro@suse.com>
- SAML: Switch from email to login for user login attribute mapping (Enterprise) - SAML: Switch from email to login for user login attribute mapping (Enterprise)
- Update Makefile and spec file - Update Makefile and spec file
* Remove phantomJS patch from Makefile * Remove phantomJS patch from Makefile
* Fix multiline strings in Makefile * Fix multiline strings in Makefile
* Exclude s390 from SLE12 builds, golang 1.14 is not built for s390 * Exclude s390 from SLE12 builds, golang 1.14 is not built for s390

35
grafana.spec
View File

@ -16,10 +16,6 @@
# #
%define GRAFANA_USER %{name}
%define GRAFANA_GROUP %{name}
%define GRAFANA_HOME %{_datadir}/%{name}
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
@ -28,7 +24,7 @@
Name: grafana Name: grafana
Version: 7.3.1 Version: 7.3.1
Release: 0 Release: 0
Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB Summary: The open-source platform for monitoring and observability.
License: Apache-2.0 License: Apache-2.0
Group: System/Monitoring Group: System/Monitoring
URL: http://grafana.org/ URL: http://grafana.org/
@ -42,10 +38,14 @@ Source4: Makefile
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: git-core BuildRequires: git-core
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: shadow BuildRequires: golang(API) >= 1.15
BuildRequires: golang(API) = 1.15
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires} Requires(post): %fillup_prereq
Requires: group(grafana)
Requires: user(grafana)
%systemd_ordering
%go_nostrip
# Exclude s390 on SLE12, since golang 1.14 itself is not built for this arch on SLE12 # Exclude s390 on SLE12, since golang 1.14 itself is not built for this arch on SLE12
# See https://build.suse.de/package/view_file/SUSE:SLE-12:Update/go1.14/go1.14.spec?expand=1 # See https://build.suse.de/package/view_file/SUSE:SLE-12:Update/go1.14/go1.14.spec?expand=1
@ -117,11 +117,6 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
%pre %pre
%service_add_pre %{name}-server.service %service_add_pre %{name}-server.service
echo "Creating user %{GRAFANA_USER} and group %{GRAFANA_GROUP} if not present"
getent group %{GRAFANA_GROUP} > /dev/null || groupadd -r %{GRAFANA_GROUP}
getent passwd %{GRAFANA_GROUP} > /dev/null || useradd -r -g %{GRAFANA_GROUP} \
-d %{GRAFANA_HOME} -s /sbin/nologin -c "%{GRAFANA_USER} user" %{GRAFANA_GROUP}
%post %post
%{fillup_only -n %{name}-server} %{fillup_only -n %{name}-server}
%service_add_post %{name}-server.service %service_add_post %{name}-server.service
@ -143,13 +138,13 @@ getent passwd %{GRAFANA_GROUP} > /dev/null || useradd -r -g %{GRAFANA_GROUP} \
%attr(0755,root,root) %dir %{_sysconfdir}/%{name} %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning %attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning
%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/dashboards %attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
%attr(0755,root,%{GRAFANA_GROUP}) %dir %{_datadir}/%{name}/conf %attr(0755,root,grafana) %dir %{_datadir}/%{name}/conf
%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini %attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml %attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name} %attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name}
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/plugins %attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name}/plugins
%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/dashboards %attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name}/dashboards
%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/log/%{name} %attr(0750,grafana,grafana) %dir %{_localstatedir}/log/%{name}
%doc %{_datadir}/%{name}/conf/sample.ini %doc %{_datadir}/%{name}/conf/sample.ini
%doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml %doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml
%doc %{_datadir}/%{name}/conf/provisioning/datasources/sample.yaml %doc %{_datadir}/%{name}/conf/provisioning/datasources/sample.yaml