Accepting request 850566 from server:monitoring
OBS-URL: https://build.opensuse.org/request/show/850566 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=14
This commit is contained in:
commit
d0cfd6b18e
6
_service
6
_service
@ -3,8 +3,8 @@
|
|||||||
<param name="url">https://github.com/grafana/grafana</param>
|
<param name="url">https://github.com/grafana/grafana</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="exclude">.git</param>
|
<param name="exclude">.git</param>
|
||||||
<param name="versionformat">7.1.5</param>
|
<param name="versionformat">7.3.1</param>
|
||||||
<param name="revision">v7.1.5</param>
|
<param name="revision">v7.3.1</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
@ -15,6 +15,6 @@
|
|||||||
<param name="basename">grafana</param>
|
<param name="basename">grafana</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="go_modules" mode="disabled">
|
<service name="go_modules" mode="disabled">
|
||||||
<param name="archive">grafana-7.1.5.tar.gz</param>
|
<param name="archive">grafana-7.3.1.tar.gz</param>
|
||||||
</service>
|
</service>
|
||||||
</services>
|
</services>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<servicedata>
|
<servicedata>
|
||||||
<service name="tar_scm">
|
<service name="tar_scm">
|
||||||
<param name="url">https://github.com/grafana/grafana</param>
|
<param name="url">https://github.com/grafana/grafana</param>
|
||||||
<param name="changesrevision">9893b8c53d77079e135e361cd32899c2d3671610</param>
|
<param name="changesrevision">6668161a88700399194a6e9d3b9f9a83383d023f</param>
|
||||||
</service>
|
</service>
|
||||||
</servicedata>
|
</servicedata>
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e9c60b1b2d60e4f2a38fcacb78d1562f8b203369ff8200c4fb0bee61f878ed30
|
|
||||||
size 29818942
|
|
3
grafana-7.3.1.tar.gz
Normal file
3
grafana-7.3.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1427e0b547fc7c545130544a9ff11e2f0ac9d8c5fb0d929a2c852e1082855e41
|
||||||
|
size 30663817
|
@ -1,3 +1,60 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- 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
|
Fri Sep 18 08:58:14 UTC 2020 - jcavalheiro@suse.com
|
||||||
|
|
||||||
|
37
grafana.spec
37
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
|
#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
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: grafana
|
Name: grafana
|
||||||
Version: 7.1.5
|
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.14
|
|
||||||
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
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1136e76f3389ce31ffcf0fde70c181f7f09915ed06e920c01dc10150e883f764
|
oid sha256:456f0987be1f1bbe4efaf395080e6af9f786f71765df88deed68f2e881a92a1a
|
||||||
size 8843090
|
size 10226749
|
||||||
|
Loading…
Reference in New Issue
Block a user