From 5843cd47b1236157f86d52c87ee96fbc227b09fc859e1dde87c2a0bd3486d296 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 3 Jun 2020 23:19:01 +0000 Subject: [PATCH] Accepting request 810636 from home:jcavalheiro:monitoring Update to v7.0.1 OBS-URL: https://build.opensuse.org/request/show/810636 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=41 --- Makefile | 11 ++--- _service | 6 +-- _servicedata | 2 +- grafana-6.7.3.tar.gz | 3 -- grafana-7.0.1.tar.gz | 3 ++ grafana.changes | 98 ++++++++++++++++++++++++++++++++++++++++++++ grafana.spec | 8 +++- vendor.tar.gz | 4 +- 8 files changed, 117 insertions(+), 18 deletions(-) delete mode 100644 grafana-6.7.3.tar.gz create mode 100644 grafana-7.0.1.tar.gz diff --git a/Makefile b/Makefile index d8fdae4..2d2d0d2 100644 --- a/Makefile +++ b/Makefile @@ -21,14 +21,9 @@ tar: gunzip ../$$tar.gz && \ tar -xf ../$$tar && \ cd $$basename && \ - # Patches for the JS frontend go after here - # No patches currently needed - # End patches section - # exclude the phantomjs-prebuilt binary module from the webpack \ - sed -i '/phantomjs-prebuilt/d' package.json && \ - # nuke grunt task for copying phantomjs \ - rm -f scripts/grunt/options/phantomjs.js && \ - sed -i '/phantomjs/d' scripts/grunt/*.js && \ + # Patches for the JS frontend go after here \ + # No patches currently needed \ + # End patches section \ yarn install --pure-lockfile && \ grunt release && \ cp -pr tmp/public . && \ diff --git a/_service b/_service index cd838b0..7069375 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/grafana/grafana git .git - 6.7.3 - v6.7.3 + 7.0.1 + v7.0.1 enable @@ -15,6 +15,6 @@ grafana - grafana-6.7.3.tar.gz + grafana-7.0.1.tar.gz diff --git a/_servicedata b/_servicedata index 32f4230..355437d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 423a25fc3280922ae9d9834ad3079e5672e5c1fa + ef5b586d7d9e561b78c8aaa098c4e9f1e3a78d62 \ No newline at end of file diff --git a/grafana-6.7.3.tar.gz b/grafana-6.7.3.tar.gz deleted file mode 100644 index fc4f6fb..0000000 --- a/grafana-6.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:130633b75b3bdc61db61f307a0087a76e7bc13078254d46f997b31e3b7edf18f -size 29296919 diff --git a/grafana-7.0.1.tar.gz b/grafana-7.0.1.tar.gz new file mode 100644 index 0000000..6a04777 --- /dev/null +++ b/grafana-7.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02eb48ac7dfccd91c93c9eceb6149855836b918e8eb1075fcff12daa0265eb68 +size 30097564 diff --git a/grafana.changes b/grafana.changes index 27eb676..2fb5740 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,101 @@ +------------------------------------------------------------------- +Mon Jun 01 13:12:54 UTC 2020 - jcavalheiro@suse.com + +- Update to version 7.0.1 + * Features / Enhancements + - Datasource/CloudWatch: Makes CloudWatch Logs query history more readable. #24795, @kaydelaney + - Download CSV: Add date and time formatting. #24992, @ryantxu + - Table: Make last cell value visible when right aligned. #24921, @peterholmberg + - TablePanel: Adding sort order persistance. #24705, @torkelo + - Transformations: Display correct field name when using reduce transformation. #25068, @peterholmberg + - Transformations: Allow custom number input for binary operations. #24752, @ryantxu + * Bug fixes + - Dashboard/Links: Fixes dashboard links by tags not working. #24773, @KamalGalrani + - Dashboard/Links: Fixes open in new window for dashboard link. #24772, @KamalGalrani + - Dashboard/Links: Variables are resolved and limits to 100. #25076, @hugohaggmark + - DataLinks: Bring back variables interpolation in title. #24970, @dprokop + - Datasource/CloudWatch: Field suggestions no longer limited to prefix-only. #24855, @kaydelaney + - Explore/Table: Keep existing field types if possible. #24944, @kaydelaney + - Explore: Fix wrap lines toggle for results of queries with filter expression. #24915, @ivanahuckova + - Explore: fix undo in query editor. #24797, @zoltanbedi + - Explore: fix word break in type head info. #25014, @zoltanbedi + - Graph: Legend decimals now work as expected. #24931, @torkelo + - LoginPage: Fix hover color for service buttons. #25009, @tskarhed + - LogsPanel: Fix scrollbar. #24850, @ivanahuckova + - MoveDashboard: Fix for moving dashboard caused all variables to be lost. #25005, @torkelo + - Organize transformer: Use display name in field order comparer. #24984, @dprokop + - Panel: shows correct panel menu items in view mode. #24912, @hugohaggmark + - PanelEditor Fix missing labels and description if there is only single option in category. #24905, @dprokop + - PanelEditor: Overrides name matcher still show all original field names even after Field default display name is specified. #24933, @torkelo + - PanelInspector: Makes sure Data display options are visible. #24902, @hugohaggmark + - PanelInspector: Hides unsupported data display options for Panel type. #24918, @hugohaggmark + - PanelMenu: Make menu disappear on button press. #25015, @tskarhed + - Postgres: Fix add button. #25087, @phemmer + - Prometheus: Fix recording rules expansion. #24977, @ivanahuckova + - Stackdriver: Fix creating Service Level Objectives (SLO) datasource query variable. #25023, @papagian + +------------------------------------------------------------------- +Sun May 24 21:43:04 UTC 2020 - Joao Cavalheiro + +- 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. + - Interval calculation: There is now a new option Max data points that controls the auto interval $__interval calculation. Interval was previously calculated by dividing the panel width by the time range. With the new max data points option it is now easy to set $__interval to a dynamic value that is time range agnostic. For example if you set Max data points to 10 Grafana will dynamically set $__interval by dividing the current time range by 10. + - Datasource/Loki: Support for deprecated Loki endpoints has been removed. + - Backend plugins: Grafana now requires backend plugins to be signed, otherwise Grafana will not load/start them. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with. Refer to Upgrade Grafana for more information. + - @grafana/ui: Forms migration notice, see @grafana/ui changelog + - @grafana/ui: Select API change for creating custom values, see @grafana/ui changelog + + Deprecation warnings + - Scripted dashboards is now deprecated. The feature is not removed but will be in a future release. We hope to address the underlying requirement of dynamic dashboards in a different way. #24059 + - The unofficial first version of backend plugins together with usage of grafana/grafana-plugin-model is now deprecated and support for that will be removed in a future release. Please refer to backend plugins documentation for information about the new officially supported backend plugins. + * Features / Enhancements + - Backend plugins: Log deprecation warning when using the unofficial first version of backend plugins. #24675, @marefr + - Editor: New line on Enter, run query on Shift+Enter. #24654, @davkal + - Loki: Allow multiple derived fields with the same name. #24437, @aocenas + - Orgs: Add future deprecation notice. #24502, @torkelo + * Bug Fixes + - @grafana/toolkit: Use process.cwd() instead of PWD to get directory. #24677, @zoltanbedi + - Admin: Makes long settings values line break in settings page. #24559, @hugohaggmark + - Dashboard: Allow editing provisioned dashboard JSON and add confirmation when JSON is copied to dashboard. #24680, @dprokop + - Dashboard: Fix for strange "dashboard not found" errors when opening links in dashboard settings. #24416, @torkelo + - Dashboard: Fix so default data source is selected when data source can't be found in panel editor. #24526, @mckn + - Dashboard: Fixed issue changing a panel from transparent back to normal in panel editor. #24483, @torkelo + - Dashboard: Make header names reflect the field name when exporting to CSV file from the the panel inspector. #24624, @peterholmberg + - Dashboard: Make sure side pane is displayed with tabs by default in panel editor. #24636, @dprokop + - Data source: Fix query/annotation help content formatting. #24687, @AgnesToulet + - Data source: Fixes async mount errors. #24579, @Estrax + - Data source: Fixes saving a data source without failure when URL doesn't specify a protocol. #24497, @aknuds1 + - Explore/Prometheus: Show results of instant queries only in table. #24508, @ivanahuckova + - Explore: Fix rendering of react query editors. #24593, @ivanahuckova + - Explore: Fixes loading more logs in logs context view. #24135, @Estrax + - Graphite: Fix schema and dedupe strategy in rollup indicators for Metrictank queries. #24685, @torkelo + - Graphite: Makes query annotations work again. #24556, @hugohaggmark + - Logs: Clicking "Load more" from context overlay doesn't expand log row. #24299, @kaydelaney + - Logs: Fix total bytes process calculation. #24691, @davkal + - Org/user/team preferences: Fixes so UI Theme can be set back to Default. #24628, @AgnesToulet + - Plugins: Fix manifest validation. #24573, @aknuds1 + - Provisioning: Use proxy as default access mode in provisioning. #24669, @bergquist + - Search: Fix select item when pressing enter and Grafana is served using a sub path. #24634, @tskarhed + - Search: Save folder expanded state. #24496, @Clarity-89 + - Security: Tag value sanitization fix in OpenTSDB data source. #24539, @rotemreiss + - Table: Do not include angular options in options when switching from angular panel. #24684, @torkelo + - Table: Fixed persisting column resize for time series fields. #24505, @torkelo + - Table: Fixes Cannot read property subRows of null. #24578, @hugohaggmark + - Time picker: Fixed so you can enter a relative range in the time picker without being converted to absolute range. #24534, @mckn + - Transformations: Make transform dropdowns not cropped. #24615, @dprokop + - Transformations: Sort order should be preserved as entered by user when using the reduce transformation. #24494, @hugohaggmark + - Units: Adds scale symbol for currencies with suffixed symbol. #24678, @hugohaggmark + - Variables: Fixes filtering options with more than 1000 entries. #24614, @hugohaggmark + - Variables: Fixes so Textbox variables read value from url. #24623, @hugohaggmark + - Zipkin: Fix error when span contains remoteEndpoint. #24524, @aocenas + - SAML: Switch from email to login for user login attribute mapping (Enterprise) + +- Update Makefile and spec file + * Remove phantomJS patch from Makefile + * Fix multiline strings in Makefile + * Exclude s390 from SLE12 builds, golang 1.14 is not built for s390 + ------------------------------------------------------------------- Thu May 14 13:57:48 UTC 2020 - Enno Gotthold diff --git a/grafana.spec b/grafana.spec index 1c5f598..2465f82 100644 --- a/grafana.spec +++ b/grafana.spec @@ -26,7 +26,7 @@ %endif Name: grafana -Version: 6.7.3 +Version: 7.0.1 Release: 0 Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB License: Apache-2.0 @@ -47,6 +47,12 @@ BuildRequires: golang(API) >= 1.14 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} +# 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 +%if 0%{?suse_version} == 1315 +ExcludeArch: s390 +%endif + %description A graph and dashboard builder for visualizing time series metrics. diff --git a/vendor.tar.gz b/vendor.tar.gz index 6cfd539..2f5fe79 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d568ae2cb1c02b56250c075a3f522173d40f4481c7b27274f074f42563f2d5d8 -size 8595334 +oid sha256:6b918ed51e1e0e250db950c4c575adb7d0dc4cea24d66e2d410e9d723fb7743a +size 8867890