diff --git a/Makefile.no_phantomjs b/Makefile similarity index 75% rename from Makefile.no_phantomjs rename to Makefile index a6c25b4..892a380 100644 --- a/Makefile.no_phantomjs +++ b/Makefile @@ -20,9 +20,11 @@ tar: cd $$tmpdir && \ tar -xf ../$$tar && \ cd $$basename && \ - sed -i 's/base\///' public/sass/base/_fonts.scss && \ - # patch frontend html template to remove phantomjs dependant link \ - sed -i 's/.*<\/a>//g' public/app/features/dashboard/components/ShareModal/template.html && \ + # 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 && \ yarn install --pure-lockfile && \ grunt release && \ cp -pr tmp/public . && \ @@ -30,8 +32,6 @@ tar: cd .. && \ echo "Updating $$basename/tools $$basename/public in tarball..." && \ tar -rf ../$$tar $$basename/tools $$basename/public && \ - # remove phantomjs binary \ - tar -f ../$$tar --delete $$basename/tools/phantomjs/phantomjs && \ # remove go.mod and go.sum as we build exclusively using vendor deps \ tar -f ../$$tar --delete $$basename/go.mod $$basename/go.sum && \ cd .. && \ diff --git a/Makefile.phantomjs b/Makefile.phantomjs deleted file mode 100644 index 4098c71..0000000 --- a/Makefile.phantomjs +++ /dev/null @@ -1,33 +0,0 @@ -NAME = grafana -SPEC = $(NAME).spec - -default: verify-deps clean tar - -verify-deps: - @which yarn >/dev/null 2>&1 || ( echo "yarn not found; run \`sudo npm install -g yarn\`" && false ) - @which grunt >/dev/null 2>&1 || ( echo "grunt not found; run \`sudo npm install -g grunt-cli\`" && false ) - -clean: - rm -f $(NAME)-*.tar $(NAME)-*.tar.xz - -tar: - osc service disabledrun - @version=$$( awk '/^Version:/ {print $$2}' $(SPEC) ) && \ - echo "Package version is $$version" && \ - basename=$(NAME)-$$version && \ - tar=$$basename.tar && \ - tmpdir=$$(mktemp -d -p .) && \ - cd $$tmpdir && \ - tar -xf ../$$tar && \ - cd $$basename && \ - sed -i 's/base\///' public/sass/base/_fonts.scss && \ - yarn install --pure-lockfile && \ - grunt release && \ - cp -pr tmp/public . && \ - cp -pr tmp/tools . && \ - cd .. && \ - echo "Updating $$basename/tools $$basename/public in tarball..." && \ - tar -rf ../$$tar $$basename/tools $$basename/public && \ - cd .. && \ - xz $$tar && \ - rm -rf $$tmpdir diff --git a/README b/README index d9d5611..cb599c7 100644 --- a/README +++ b/README @@ -14,10 +14,10 @@ we have a Makefile which does the following: then compresses it with xz. - The tarball can then be used by OBS to build an RPM. -In order for this to work you need to have npm >= 6, yarn and grunt -installed. To get set up, run: +In order for this to work you need to have npm >= 6, < 12, yarn and +grunt installed. To get set up, run: - # zypper in npm + # zypper in npm10 # npm install -g yarn # npm install -g grunt-cli diff --git a/_service b/_service index 955c8a7..7d1325c 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/grafana/grafana git .git - 6.3.5 - v6.3.5 + 6.4.3 + v6.4.3 enable diff --git a/_servicedata b/_servicedata index da109ca..1f8d7da 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 67bad726f12efb21893c75c141f2330a4a3cbe2a + 3a2bfb7e3809a193125f0dbb8109e95cbf52db3e \ No newline at end of file diff --git a/grafana-6.3.5.tar.xz b/grafana-6.3.5.tar.xz deleted file mode 100644 index 7665151..0000000 --- a/grafana-6.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdfcabcdb8f4207efb6e1d8c55861f92ea9558f570f384a35eabc9a5a234a306 -size 17615204 diff --git a/grafana-6.4.3.tar.xz b/grafana-6.4.3.tar.xz new file mode 100644 index 0000000..8879f1a --- /dev/null +++ b/grafana-6.4.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cb6e8bf9f1080022dc169fa29afbb5876acbc5adba2c4420a8dbf1ef9a2aa4c +size 18172892 diff --git a/grafana.changes b/grafana.changes index 4b0bbb9..ac43636 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,168 @@ +------------------------------------------------------------------- +Tue Dec 03 15:09:41 UTC 2019 - witold.bedyk@suse.com + +- Revert the spec file and make script +- Remove PhantomJS dependency + +------------------------------------------------------------------- +Wed Oct 16 19:29:48 UTC 2019 - ecsos@opensuse.org + +- Update to 6.4.3 + * Bug Fixes + - Alerting: All notification channels should send even if one fails to send. #19807, @jan25 + - AzureMonitor: Fix slate interference with dropdowns. #19799, @aocenas + - ContextMenu: make ContextMenu positioning aware of the viewport width. #19699, @krvajal + - DataLinks: Fix context menu not showing in singlestat-ish visualisations. #19809, @dprokop + - DataLinks: Fix url field not releasing focus. #19804, @aocenas + - Datasource: Fixes clicking outside of some query editors required 2 clicks. #19822, @aocenas + - Panels: Fixes default tab for visualizations without Queries Tab. #19803, @hugohaggmark + - Singlestat: Fixed issue with mapping null to text. #19689, @torkelo + - @grafana/toolkit: Don't fail plugin creation when git user.name config is not set. #19821, @dprokop + - @grafana/toolkit: TSLint line number off by 1. #19782, @fredwangwang + +------------------------------------------------------------------- +Wed Oct 16 15:31:57 UTC 2019 - ecsos@opensuse.org + +- Update to 6.4.2 + * Bug Fixes + - CloudWatch: Changes incorrect dimension wmlid to wlmid . #19679, @ATTron + - Grafana Image Renderer: Fixes plugin page. #19664, @hugohaggmark + - Graph: Fixes auto decimals logic for y axis ticks that results in too many decimals for high values. #19618, @torkelo + - Graph: Switching to series mode should re-render graph. #19623, @torkelo + - Loki: Fix autocomplete on label values. #19579, @aocenas + - Loki: Removes live option for logs panel. #19533, @davkal + - Profile: Fix issue with user profile not showing more than sessions sessions in some cases. #19578, @huynhsamha + - Prometheus: Fixes so results in Panel always are sorted by query order. #19597, @hugohaggmark + - ShareQuery: Fixed issue when using -- Dashboard -- datasource (to share query result) when dashboard had rows. #19610, @torkelo + - Show SAML login button if SAML is enabled. #19591, @papagian + - SingleStat: Fixes postfix/prefix usage. #19687, @hugohaggmark + - Table: Proper handling of json data with dataframes. #19596, @marefr + - Units: Fixed wrong id for Terabits/sec. #19611, @andreaslangnevyjel + +- Changes from 6.4.1 + * Bug Fixes + - Provisioning: Fixed issue where empty nested keys in YAML provisioning caused a server crash, #19547 + - ImageRendering: Fixed issue with image rendering in enterprise build (Enterprise) + - Reporting: Fixed issue with reporting service when STMP was disabled (Enterprise). + +- Changes from 6.4.0 + * Features / Enhancements + - Build: Upgrade go to 1.12.10. #19499, @marefr + - DataLinks: Suggestions menu improvements. #19396, @dprokop + - Explore: Take root_url setting into account when redirecting from dashboard to explore. #19447, @ivanahuckova + - Explore: Update broken link to logql docs. #19510, @ivanahuckova + - Logs: Adds Logs Panel as a visualization. #19504, @davkal + * Bug Fixes + - CLI: Fix version selection for plugin install. #19498, @aocenas + - Graph: Fixes minor issue with series override color picker and custom color . #19516, @torkelo + +- Changes from 6.4.0 Beta 2 + * Features / Enhancements + - Azure Monitor: Remove support for cross resource queries (#19115)". #19346, @sunker + - Docker: Upgrade packages to resolve reported vulnerabilities. #19188, @marefr + - Graphite: Time range expansion reduced from 1 minute to 1 second. #19246, @torkelo + - grafana/toolkit: Add plugin creation task. #19207, @dprokop + * Bug Fixes + - Alerting: Prevents creating alerts from unsupported queries. #19250, @hugohaggmark + - Alerting: Truncate PagerDuty summary when greater than 1024 characters. #18730, @nvllsvm + - Cloudwatch: Fix autocomplete for Gamelift dimensions. #19146, @kevinpz + - Dashboard: Fix export for sharing when panels use default data source. #19315, @torkelo + - Database: Rewrite system statistics query to perform better. #19178, @papagian + - Gauge/BarGauge: Fix issue with [object Object] in titles . #19217, @ryantxu + - MSSQL: Revert usage of new connectionstring format introduced by #18384. #19203, @marefr + - Multi-LDAP: Do not fail-fast on invalid credentials. #19261, @gotjosh + - MySQL, Postgres, MSSQL: Fix validating query with template variables in alert . #19237, @marefr + - MySQL, Postgres: Update raw sql when query builder updates. #19209, @marefr + - MySQL: Limit datasource error details returned from the backend. #19373, @marefr + +- Changes from 6.4.0 Beta 1 + * Features / Enhancements + - API: Readonly datasources should not be created via the API. #19006, @papagian + - Alerting: Include configured AlertRuleTags in Webhooks notifier. #18233, @dominic-miglar + - Annotations: Add annotations support to Loki. #18949, @aocenas + - Annotations: Use a single row to represent a region. #17673, @ryantxu + - Auth: Allow inviting existing users when login form is disabled. #19048, @548017 + - Azure Monitor: Add support for cross resource queries. #19115, @sunker + - CLI: Allow installing custom binary plugins. #17551, @aocenas + - Dashboard: Adds Logs Panel (alpha) as visualization option for Dashboards. #18641, @hugohaggmark + - Dashboard: Reuse query results between panels . #16660, @ryantxu + - Dashboard: Set time to to 23:59:59 when setting To time using calendar. #18595, @simPod + - DataLinks: Add DataLinks support to Gauge, BarGauge and SingleStat2 panel. #18605, @ryantxu + - DataLinks: Enable access to labels & field names. #18918, @torkelo + - DataLinks: Enable multiple data links per panel. #18434, @dprokop + - Docker: switch docker image to alpine base with phantomjs support. #18468, @DanCech + - Elasticsearch: allow templating queries to order by doc_count. #18870, @hackery + - Explore: Add throttling when doing live queries. #19085, @aocenas + - Explore: Adds ability to go back to dashboard, optionally with query changes. #17982, @kaydelaney + - Explore: Reduce default time range to last hour. #18212, @davkal + - Gauge/BarGauge: Support decimals for min/max. #18368, @ryantxu + - Graph: New series override transform constant that renders a single point as a line across the whole graph. #19102, @davkal + - Image rendering: Add deprecation warning when PhantomJS is used for rendering images. #18933, @papagian + - InfluxDB: Enable interpolation within ad-hoc filter values. #18077, @kvc-code + - LDAP: Allow an user to be synchronized against LDAP. #18976, @gotjosh + - Ldap: Add ldap debug page. #18759, @peterholmberg + - Loki: Remove prefetching of default label values. #18213, @davkal + - Metrics: Add failed alert notifications metric. #18089, @koorgoo + - OAuth: Support JMES path lookup when retrieving user email. #14683, @bobmshannon + - OAuth: return GitLab groups as a part of user info (enable team sync). #18388, @alexanderzobnin + - Panels: Add unit for electrical charge - ampere-hour. #18950, @anirudh-ramesh + - Plugin: AzureMonitor - Reapply MetricNamespace support. #17282, @raphaelquati + - Plugins: better warning when plugins fail to load. #18671, @ryantxu + - Postgres: Add support for scram sha 256 authentication. #18397, @nonamef + - RemoteCache: Support SSL with Redis. #18511, @kylebrandt + - SingleStat: The gauge option in now disabled/hidden (unless it's an old panel with it already enabled) . #18610, @ryantxu + - Stackdriver: Add extra alignment period options. #18909, @sunker + - Units: Add South African Rand (ZAR) to currencies. #18893, @jeteon + - Units: Adding T,P,E,Z,and Y bytes. #18706, @chiqomar + * Bug Fixes + - Alerting: Notification is sent when state changes from no_data to ok. #18920, @papagian + - Alerting: fix duplicate alert states when the alert fails to save to the database. #18216, @kylebrandt + - Alerting: fix response popover prompt when add notification channels. #18967, @lzdw + - CloudWatch: Fix alerting for queries with Id (using GetMetricData). #17899, @alex-berger + - Explore: Fix auto completion on label values for Loki. #18988, @aocenas + - Explore: Fixes crash using back button with a zoomed in graph. #19122, @hugohaggmark + - Explore: Fixes so queries in Explore are only run if Graph/Table is shown. #19000, @hugohaggmark + - MSSQL: Change connectionstring to URL format to fix using passwords with semicolon. #18384, @Russiancold + - MSSQL: Fix memory leak when debug enabled. #19049, @briangann + - Provisioning: Allow escaping literal '$' with '$$' in configs to avoid interpolation. #18045, @kylebrandt + - TimePicker: Fixes hiding time picker dropdown in FireFox. #19154, @hugohaggmark + * Breaking changes + + Annotations + There are some breaking changes in the annotations HTTP API for region annotations. Region annotations are now represented + using a single event instead of two seperate events. Check breaking changes in HTTP API below and HTTP API documentation for more details. + + Docker + Grafana is now using Alpine 3.10 as docker base image. + + HTTP API + - GET /api/alert-notifications now requires at least editor access. + New /api/alert-notifications/lookup returns less information than /api/alert-notifications and can be access by any authenticated user. + - GET /api/alert-notifiers now requires at least editor access + - GET /api/org/users now requires org admin role. + New /api/org/users/lookup returns less information than /api/org/users and can be access by users that are org admins, + admin in any folder or admin of any team. + - GET /api/annotations no longer returns regionId property. + - POST /api/annotations no longer supports isRegion property. + - PUT /api/annotations/:id no longer supports isRegion property. + - PATCH /api/annotations/:id no longer supports isRegion property. + - DELETE /api/annotations/region/:id has been removed. + * Deprecation notes + + PhantomJS + - PhantomJS, which is used for rendering images of dashboards and panels, + is deprecated and will be removed in a future Grafana release. + A deprecation warning will from now on be logged when Grafana starts up if PhantomJS is in use. + Please consider migrating from PhantomJS to the Grafana Image Renderer plugin. + +- Changes from 6.3.6 + * Features / Enhancements + - Metrics: Adds setting for turning off total stats metrics. #19142, @marefr + * Bug Fixes + - Database: Rewrite system statistics query to perform better. #19178, @papagian + - Explore: Fixes error when switching from prometheus to loki data sources. #18599, @kaydelaney + +- Rebase package spec. Use mostly from fedora, fix suse specified things and fix some errors. +- Add missing directories provisioning/datasources and provisioning/notifiers + and sample.yaml as described in packaging/rpm/control from upstream. + Missing directories are shown in logfiles. + ------------------------------------------------------------------- Thu Sep 05 08:07:21 UTC 2019 - simon.crute@grafana.com diff --git a/grafana.spec b/grafana.spec index f4c55f1..4cfca95 100644 --- a/grafana.spec +++ b/grafana.spec @@ -1,7 +1,7 @@ # # spec file for package grafana # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,32 +25,25 @@ %define _fillupdir /var/adm/fillup-templates %endif -%bcond_with phantomjs - Name: grafana -Version: 6.3.5 +Version: 6.4.3 Release: 0 Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB License: Apache-2.0 Group: System/Monitoring -Url: http://grafana.org/ +URL: http://grafana.org/ Source: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc # Instructions on the build process Source2: README # Makefile to automate build process -Source3: Makefile.no_phantomjs -Source4: Makefile.phantomjs +Source3: Makefile BuildRequires: fdupes BuildRequires: go >= 1.11 BuildRequires: golang-packaging BuildRequires: shadow Requires(post): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with phantomjs} -BuildRequires: phantomjs -Requires: phantomjs -%endif %{?systemd_requires} %description @@ -61,11 +54,6 @@ dashboards and data with teams. %prep %setup -q -n grafana-%{version} -%if %{with phantomjs} -cp %{S:4} %_sourcedir/Makefile -%else -cp %{S:3} %_sourcedir/Makefile -%endif %build %goprep github.com/grafana/grafana @@ -110,17 +98,6 @@ cp -pr public %{buildroot}%{_datadir}/%{name}/ install -d -m755 %{buildroot}%{_datadir}/%{name}/vendor install -d -m755 %{buildroot}%{_datadir}/%{name}/tools -%if %{with phantomjs} -# phantomjs is used for rendering PNG images of graphs. The frontend asset -# build process downloadsa prebuilt x86_64 binary, which ends up in -# vendor/phantomjs/phantomjs. This is ugly but works for x86_64. It naturally -# will not work for other architectures, so instead we remove the phantomjs -# binary and install a symlink to the systemwide /usr/bin/phantomjs. -cp -pr tools/phantomjs %{buildroot}%{_datadir}/%{name}/tools/ -rm -f %{buildroot}%{_datadir}/%{name}/tools/phantomjs/phantomjs -ln -s %{_bindir}/phantomjs %{buildroot}%{_datadir}/%{name}/tools/phantomjs/phantomjs -%endif - # Do *not* use %%fudpes -s -- this will result in grafana failing to load # all the plugins (something in the plugin scanner can't cope with files # in there being symlinks).