diff --git a/_service b/_service index 45ca641..a2fc4f8 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/grafana/grafana git .git - 7.1.5 - v7.1.5 + 7.3.1 + v7.3.1 enable @@ -15,6 +15,6 @@ grafana - grafana-7.1.5.tar.gz + grafana-7.3.1.tar.gz diff --git a/_servicedata b/_servicedata index a65dd33..553e51d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 9893b8c53d77079e135e361cd32899c2d3671610 + 6668161a88700399194a6e9d3b9f9a83383d023f \ No newline at end of file diff --git a/grafana-7.1.5.tar.gz b/grafana-7.1.5.tar.gz deleted file mode 100644 index 6f0bfcf..0000000 --- a/grafana-7.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9c60b1b2d60e4f2a38fcacb78d1562f8b203369ff8200c4fb0bee61f878ed30 -size 29818942 diff --git a/grafana-7.3.1.tar.gz b/grafana-7.3.1.tar.gz new file mode 100644 index 0000000..9286291 --- /dev/null +++ b/grafana-7.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1427e0b547fc7c545130544a9ff11e2f0ac9d8c5fb0d929a2c852e1082855e41 +size 30663817 diff --git a/grafana.changes b/grafana.changes index c83bd98..612bbd8 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Mon Nov 9 16:50:36 UTC 2020 - Stefano Torresi + +- 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 + +- Update to version 7.3.1: + * 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. + - 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 + - AzureMonitor: Support decimal (as float64) type in analytics/logs. + - Add monitoring mixing for Grafana. + - CloudWatch: Missing Namespace AWS/EC2CapacityReservations. + - CloudWatch: Add support for AWS DirectConnect virtual interface metrics and add missing dimensions. + - CloudWatch: Adding support for Amazon ElastiCache Redis metrics. + - CloudWatch: Adding support for additional Amazon CloudFront metrics. + - CloudWatch: Re-implement authentication. + - Elasticsearch: Support multiple pipeline aggregations for a query. + - Prometheus: Add time range parameters to labels API. + - Loki: Visually distinguish error logs for LogQL2. + - Api: Add /healthz endpoint for health checks. + - API: Enrich add user to org endpoints with user ID in the response. + - API: Enrich responses and improve error handling for alerting API endpoints. + - Elasticsearch: Add support for date_nanos type. + - Elasticsearch: Allow fields starting with underscore. + - Elasticsearch: Increase maximum geohash aggregation precision to 12. + - Postgres: Support request cancellation properly (Uses new backendSrv.fetch Observable request API). + - Provisioning: Remove provisioned dashboards without parental reader. + - API: Return ID of the deleted resource for dashboard, datasource and folder DELETE endpoints. + - API: Support paging in the admin orgs list API. + - API: return resource ID for auth key creation, folder permissions update and user invite complete endpoints. + - BackendSrv: Uses credentials, deprecates withCredentials & defaults to same-origin. + - CloudWatch: Update list of AmazonMQ metrics and dimensions. + - Cloudwatch: Add Support for external ID in assume role. + - Cloudwatch: Add af-south-1 region. + - DateFormats: Default ISO & US formats never omit date part even if date is today (breaking change). + - Explore: Transform prometheus query to elasticsearch query. + - InfluxDB/Flux: Increase series limit for Flux datasource. + - InfluxDB: exclude result and table column from Flux table results. + - InfluxDB: return a table rather than an error when timeseries is missing time. + - Loki: Add scopedVars support in legend formatting for repeated variables. + - Loki: Re-introduce running of instant queries. + - Loki: Support request cancellation properly (Uses new backendSrv.fetch Observable request API). + - MixedDatasource: Shows retrieved data even if a data source fails. + - Postgres: Support Unix socket for host. + - Prometheus: Add scopedVars support in legend formatting for repeated variables. + - Prometheus: Support request cancellation properly (Uses new backendSrv.fetch Observable request API). + - Prometheus: add $__rate_interval variable. + - Table: Adds column filtering. + - grafana-cli: Add ability to read password from stdin to reset admin password. + ------------------------------------------------------------------- Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com @@ -10,18 +67,18 @@ Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com - Graph: Support setting field unit & override data source (automatic) unit. - Explore: Unification of logs/metrics/traces user interface - 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. - Search: support URL query params. - Grafana-UI: Add FileUpload. - TablePanel: Sort numbers correctly. * Bug fixes - 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. - Templating: Fixes so texts show in picker not the values. - 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. - Query history: Fix search filtering if null value. - Flux: Ensure connections to InfluxDB are closed. @@ -38,7 +95,7 @@ Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com - Datasources: Handle URL parsing error. - Security: Use Header.Set and Header.Del for X-Grafana-User header. * 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 @@ -98,7 +155,7 @@ Mon Jun 01 13:12:54 UTC 2020 - jcavalheiro@suse.com ------------------------------------------------------------------- Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro -- Update to version 7.0.0 +- Update to version 7.0.0 * 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. - Dashboard: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds. @@ -153,7 +210,7 @@ Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro - SAML: Switch from email to login for user login attribute mapping (Enterprise) - Update Makefile and spec file - * Remove phantomJS patch from Makefile + * Remove phantomJS patch from Makefile * Fix multiline strings in Makefile * Exclude s390 from SLE12 builds, golang 1.14 is not built for s390 diff --git a/grafana.spec b/grafana.spec index dcd7e10..b69b8da 100644 --- a/grafana.spec +++ b/grafana.spec @@ -16,19 +16,15 @@ # -%define GRAFANA_USER %{name} -%define GRAFANA_GROUP %{name} -%define GRAFANA_HOME %{_datadir}/%{name} - #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif Name: grafana -Version: 7.1.5 +Version: 7.3.1 Release: 0 -Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB +Summary: The open-source platform for monitoring and observability. License: Apache-2.0 Group: System/Monitoring URL: http://grafana.org/ @@ -42,10 +38,14 @@ Source4: Makefile BuildRequires: fdupes BuildRequires: git-core BuildRequires: golang-packaging -BuildRequires: shadow -BuildRequires: golang(API) = 1.14 +BuildRequires: golang(API) >= 1.15 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 # 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 %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 %{fillup_only -n %{name}-server} %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}/provisioning %attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/dashboards -%attr(0755,root,%{GRAFANA_GROUP}) %dir %{_datadir}/%{name}/conf -%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini -%attr(0640,root,%{GRAFANA_GROUP}) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml -%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name} -%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/plugins -%attr(0755,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/lib/%{name}/dashboards -%attr(0750,%{GRAFANA_USER},%{GRAFANA_GROUP}) %dir %{_localstatedir}/log/%{name} +%attr(0755,root,grafana) %dir %{_datadir}/%{name}/conf +%attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini +%attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml +%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name} +%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name}/plugins +%attr(0755,grafana,grafana) %dir %{_localstatedir}/lib/%{name}/dashboards +%attr(0750,grafana,grafana) %dir %{_localstatedir}/log/%{name} %doc %{_datadir}/%{name}/conf/sample.ini %doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml %doc %{_datadir}/%{name}/conf/provisioning/datasources/sample.yaml diff --git a/vendor.tar.gz b/vendor.tar.gz index 1108b1a..224c6e5 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1136e76f3389ce31ffcf0fde70c181f7f09915ed06e920c01dc10150e883f764 -size 8843090 +oid sha256:456f0987be1f1bbe4efaf395080e6af9f786f71765df88deed68f2e881a92a1a +size 10226749