subject:"commit grafana for openSUSE\:Factory"

commit grafana for openSUSE:Factory

2020-09-25 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-09-25 16:32:02

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.4249 (New)


Package is "grafana"

Fri Sep 25 16:32:02 2020 rev:13 rq:835389 version:7.1.5

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-06-09 
00:08:36.802131291 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.4249/grafana.changes
2020-09-25 16:32:34.775946050 +0200
@@ -1,0 +2,42 @@
+Fri Sep 18 08:58:14 UTC 2020 - jcavalhe...@suse.com
+
+- Update to version 7.1.5:
+  * Features / Enhancements
+- Stats: Stop counting the same user multiple times.
+- Field overrides: Filter by field name using regex.
+- AzureMonitor: map more units.
+- Explore: Don't run queries on datasource change.
+- 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. 
+- 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. 
+- 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. 
+- 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.
+- Dashboard: Fix for viewer can enter panel edit mode by modifying url 
(but cannot not save anything).
+- Prometheus: Fix prom links in mixed mode.
+- Sign In Use correct url for the Sign In button.
+- StatPanel: Fixes issue with name showing for single series / field 
results
+- BarGauge: Fix space bug in single series mode.
+- Auth: Fix POST request failures with anonymous access
+- Templating: Fix recursive loop of template variable queries when 
changing ad-hoc-variable
+- Templating: Fixed recursive queries triggered when switching dashboard 
settings view
+- GraphPanel: Fix annotations overflowing panels.
+- Prometheus: Fix performance issue in processing of histogram labels.
+- 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  
+
+---

Old:

  grafana-7.0.3.tar.gz

New:

  grafana-7.1.5.tar.gz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.y6yeba/_old  2020-09-25 16:32:36.071947201 +0200
+++ /var/tmp/diff_new_pack.y6yeba/_new  2020-09-25 16:32:36.075947205 +0200
@@ -26,7 +26,7 @@
 %endif
 
 Name:   grafana
-Version:7.0.3
+Version:7.1.5
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0
@@ -43,7 +43,7 @@
 BuildRequires:  git-core
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
-BuildRequires:  golang(API) >= 1.14
+BuildRequires:  golang(API) = 1.14
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 

++ _service ++
--- /var/tmp/diff_new_pack.y6yeba/_old  2020-09-25 16:32:36.127947251 +0200
+++ /var/tmp/diff_new_pack.y6yeba/_new  2020-09-25 16:32:36.127947251 +0200
@@ -3,8 +3,8 @@
 https://github.com/grafana/grafana
 git
 .git
-7.0.3
-v7.0.3
+7.1.5
+v7.1.5
 enable
   
   
@@ -15,6 +15,6 @@
 grafana
   
   
-grafana-7.0.3.tar.gz
+grafana-7.1.5.tar.gz
   
 

++ _servicedata ++
--- /var/tmp/diff_new_pack.y6yeba/_old  2020-09-25 16:32:36.147947268 +0200
+++ /var/tmp/diff_new_pack.y6yeba/_new  2020-09-25 16:32:36.147947268 +0200
@@ -1,6 +1,6 @@
 
   
 https://github.com/grafana/grafana
-00ee734baf8ddc86839cb20e8f6e9cb8aeb6c754
+9893b8c53d77079e135e361cd32899c2d3671610
   
 
\ No newline at end of file

++ grafana-7.0.3.tar.gz -> grafana-7.1.5.tar.gz ++
/work/SRC/openSUSE:Factory/grafana/grafana-7.0.3.tar.gz 
/work/SRC/openSUSE:Factory/.grafana.new.4249/grafana-7.1.5.tar.gz differ: char 
5, line 1

commit grafana for openSUSE:Factory

2020-06-08 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-06-09 00:06:20

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.3606 (New)


Package is "grafana"

Tue Jun  9 00:06:20 2020 rev:12 rq:812450 version:7.0.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-06-04 
17:55:43.596870493 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.3606/grafana.changes
2020-06-09 00:08:36.802131291 +0200
@@ -1,0 +2,19 @@
+Fri Jun 05 10:31:13 UTC 2020 - jcavalhe...@suse.com
+
+- Update to version 7.0.3
+  * Features / Enhancements
+- Stats: include all fields. #24829, @ryantxu
+- Variables: change VariableEditorList row action Icon to IconButton. 
#25217, @hshoff
+  * Bug fixes
+- Cloudwatch: Fix dimensions of DDoSProtection. #25317, @papagian
+- Configuration: Fix env var override of sections containing hyphen. 
#25178, @marefr
+- Dashboard: Get panels in collapsed rows. #25079, @peterholmberg
+- Do not show alerts tab when alerting is disabled. #25285, @dprokop
+- Jaeger: fixes cascader option label duration value. #25129, @Estrax
+- Transformations: Fixed Transform tab crash & no update after adding 
first transform. #25152, @torkelo
+
+- Update to version 7.0.2
+  * Bug fixes
+- Security: Urgent security patch release to fix CVE-2020-13379
+
+---

Old:

  grafana-7.0.1.tar.gz

New:

  grafana-7.0.3.tar.gz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.rbSMj3/_old  2020-06-09 00:08:48.958174416 +0200
+++ /var/tmp/diff_new_pack.rbSMj3/_new  2020-06-09 00:08:48.966174445 +0200
@@ -26,7 +26,7 @@
 %endif
 
 Name:   grafana
-Version:7.0.1
+Version:7.0.3
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.rbSMj3/_old  2020-06-09 00:08:49.022174643 +0200
+++ /var/tmp/diff_new_pack.rbSMj3/_new  2020-06-09 00:08:49.022174643 +0200
@@ -3,8 +3,8 @@
 https://github.com/grafana/grafana
 git
 .git
-7.0.1
-v7.0.1
+7.0.3
+v7.0.3
 enable
   
   
@@ -15,6 +15,6 @@
 grafana
   
   
-grafana-7.0.1.tar.gz
+grafana-7.0.3.tar.gz
   
 

++ _servicedata ++
--- /var/tmp/diff_new_pack.rbSMj3/_old  2020-06-09 00:08:49.050174743 +0200
+++ /var/tmp/diff_new_pack.rbSMj3/_new  2020-06-09 00:08:49.050174743 +0200
@@ -1,6 +1,6 @@
 
   
 https://github.com/grafana/grafana
-ef5b586d7d9e561b78c8aaa098c4e9f1e3a78d62
+00ee734baf8ddc86839cb20e8f6e9cb8aeb6c754
   
 
\ No newline at end of file

++ grafana-7.0.1.tar.gz -> grafana-7.0.3.tar.gz ++
/work/SRC/openSUSE:Factory/grafana/grafana-7.0.1.tar.gz 
/work/SRC/openSUSE:Factory/.grafana.new.3606/grafana-7.0.3.tar.gz differ: char 
5, line 1

++ vendor.tar.gz ++
/work/SRC/openSUSE:Factory/grafana/vendor.tar.gz 
/work/SRC/openSUSE:Factory/.grafana.new.3606/vendor.tar.gz differ: char 5, line 
1

commit grafana for openSUSE:Factory

2020-06-04 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-06-04 17:55:22

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.3606 (New)


Package is "grafana"

Thu Jun  4 17:55:22 2020 rev:11 rq:811254 version:7.0.1

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-05-19 
14:49:59.436270519 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.3606/grafana.changes
2020-06-04 17:55:43.596870493 +0200
@@ -1,0 +2,98 @@
+Mon Jun 01 13:12:54 UTC 2020 - jcavalhe...@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

commit grafana for openSUSE:Factory

2020-05-19 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-05-19 14:49:53

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.2738 (New)


Package is "grafana"

Tue May 19 14:49:53 2020 rev:10 rq:807124 version:6.7.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-05-12 
22:31:00.263703130 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.2738/grafana.changes
2020-05-19 14:49:59.436270519 +0200
@@ -1,0 +2,5 @@
+Thu May 14 13:57:48 UTC 2020 - Enno Gotthold 
+
+- Add instructions for patching the Grafana javascript frontend.
+
+---



Other differences:
--
++ Makefile ++
--- /var/tmp/diff_new_pack.ptIrVJ/_old  2020-05-19 14:50:00.324272488 +0200
+++ /var/tmp/diff_new_pack.ptIrVJ/_new  2020-05-19 14:50:00.324272488 +0200
@@ -21,6 +21,9 @@
 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 \

++ README ++
--- /var/tmp/diff_new_pack.ptIrVJ/_old  2020-05-19 14:50:00.344272533 +0200
+++ /var/tmp/diff_new_pack.ptIrVJ/_new  2020-05-19 14:50:00.344272533 +0200
@@ -26,4 +26,15 @@
 Then, to package a new release of Grafana, run `make` then `osc ci`
 and you should be good.
 
+If you have a patch for the Javascript frontend to apply you need
+to do the following:
+
+- Create the patch and add it with `osc add ` to the repo
+- Open the Makefile
+- Add after the `cd $$basename && \` the patch with:
+  `patch -p1 < ../../000x-.patch && \`
+- Do NOT add the patch to the Specfile.
+- Then use the process of building Grafana as described above.
+
 Please direct any questions to Tim Serong 
+If Tim is not available you may also contact Enno Gotthold

commit grafana for openSUSE:Factory

2020-05-12 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-05-12 22:29:02

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.2738 (New)


Package is "grafana"

Tue May 12 22:29:02 2020 rev:9 rq:801273 version:6.7.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-05-01 
11:16:24.644246407 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.2738/grafana.changes
2020-05-12 22:31:00.263703130 +0200
@@ -1,0 +2,7 @@
+Tue May  5 17:34:34 UTC 2020 - Jeff Kowalczyk 
+
+- BuildRequires golang(API) instead of go metapackage version range
+  * BuildRequires:  golang(API) >= 1.14   from
+BuildRequires:  ( go >= 1.14 with go < 1.15 )
+
+---



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.PGqDmD/_old  2020-05-12 22:31:03.011708865 +0200
+++ /var/tmp/diff_new_pack.PGqDmD/_new  2020-05-12 22:31:03.015708873 +0200
@@ -43,7 +43,7 @@
 BuildRequires:  git-core
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
-BuildRequires:  ( go >= 1.14 with go < 1.15 )
+BuildRequires:  golang(API) >= 1.14
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}

commit grafana for openSUSE:Factory

2020-05-01 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-05-01 11:16:09

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.2738 (New)


Package is "grafana"

Fri May  1 11:16:09 2020 rev:8 rq:799306 version:6.7.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-03-26 
23:35:19.686819539 +0100
+++ /work/SRC/openSUSE:Factory/.grafana.new.2738/grafana.changes
2020-05-01 11:16:24.644246407 +0200
@@ -1,0 +2,31 @@
+Tue Apr 28 10:00:58 UTC 2020 - Enno Gotthold 
+
+- Update to version 6.7.3
+  - This version fixes bsc#1170557 and its corresponding CVE-2020-12245
+  - Admin: Fix Synced via LDAP message for non-LDAP external users. #23477, 
@alexanderzobnin
+  - Alerting: Fixes notifications for alerts with empty message in Google 
Hangouts notifier. #23559, @hugohaggmark
+  - AuthProxy: Fixes bug where long username could not be cached.. #22926, 
@jcmcken
+  - Dashboard: Fix saving dashboard when editing raw dashboard JSON model. 
#23314, @peterholmberg
+  - Dashboard: Try to parse 8 and 15 digit numbers as timestamps if parsing of 
time range as date fails. #21694, @jessetan
+  - DashboardListPanel: Fixed problem with empty panel after going into edit 
mode (General folder filter being automatically added) . #23426, @torkelo
+  - Data source: Handle datasource withCredentials option properly. #23380, 
@hvtuananh
+  - Security: Fix annotation popup XSS vulnerability. #23813, @torkelo
+  - Server: Exit Grafana with status code 0 if no error. #23312, @aknuds1
+  - TablePanel: Fix XSS issue in header column rename (backport). #23814, 
@torkelo
+  - Variables: Fixes error when setting adhoc variable values. #23580, 
@hugohaggmark
+
+---
+Mon Apr 06 12:00:17 UTC 2020 - egotth...@suse.com
+
+- Update to version 6.7.2:
+  (see installed changelog for the full list of changes)
+  -  BackendSrv: Adds config to response to fix issue for external plugins 
that used this property . #23032, @torkelo
+  -  Dashboard: Fixed issue with saving new dashboard after changing title . 
#23104, @dprokop
+  -  DataLinks: make sure we use the correct datapoint when dataset contains 
null value.. #22981, @mckn
+  -  Plugins: Fixed issue for plugins that imported dateMath util . #23069, 
@mckn
+  -  Security: Fix for dashboard snapshot original dashboard link could 
contain XSS vulnerability in url. #23254, @torkelo
+  -  Variables: Fixes issue with too many queries being issued for nested 
template variables after value change. #23220, @torkelo
+  -  Plugins: Expose promiseToDigest. #23249, @torkelo
+  -  Reporting (Enterprise): Fixes issue updating a report created by someone 
else
+
+---

Old:

  grafana-6.7.1.tar.gz

New:

  grafana-6.7.3.tar.gz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.iS3Uew/_old  2020-05-01 11:16:29.184256281 +0200
+++ /var/tmp/diff_new_pack.iS3Uew/_new  2020-05-01 11:16:29.188256289 +0200
@@ -26,7 +26,7 @@
 %endif
 
 Name:   grafana
-Version:6.7.1
+Version:6.7.3
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.iS3Uew/_old  2020-05-01 11:16:29.260256446 +0200
+++ /var/tmp/diff_new_pack.iS3Uew/_new  2020-05-01 11:16:29.260256446 +0200
@@ -3,8 +3,8 @@
 https://github.com/grafana/grafana
 git
 .git
-6.7.1
-v6.7.1
+6.7.3
+v6.7.3
 enable
   
   
@@ -15,6 +15,6 @@
 grafana
   
   
-grafana-6.7.1.tar.gz
+grafana-6.7.3.tar.gz
   
 

++ _servicedata ++
--- /var/tmp/diff_new_pack.iS3Uew/_old  2020-05-01 11:16:29.280256489 +0200
+++ /var/tmp/diff_new_pack.iS3Uew/_new  2020-05-01 11:16:29.280256489 +0200
@@ -1,6 +1,6 @@
 
   
 https://github.com/grafana/grafana
-3fa63cfc34668781c7f9b3caafe6d9d400b06b7f
+423a25fc3280922ae9d9834ad3079e5672e5c1fa
   
 
\ No newline at end of file

++ grafana-6.7.1.tar.gz -> grafana-6.7.3.tar.gz ++
/work/SRC/openSUSE:Factory/grafana/grafana-6.7.1.tar.gz 
/work/SRC/openSUSE:Factory/.grafana.new.2738/grafana-6.7.3.tar.gz differ: char 
5, line 1

++ vendor.tar.gz ++
/work/SRC/openSUSE:Factory/grafana/vendor.tar.gz 
/work/SRC/openSUSE:Factory/.grafana.new.2738/vendor.tar.gz differ: char 5, line 
1

commit grafana for openSUSE:Factory

2020-03-26 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-03-26 23:34:54

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.3160 (New)


Package is "grafana"

Thu Mar 26 23:34:54 2020 rev:7 rq:788582 version:6.7.1

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2020-03-19 
19:54:16.984277644 +0100
+++ /work/SRC/openSUSE:Factory/.grafana.new.3160/grafana.changes
2020-03-26 23:35:19.686819539 +0100
@@ -1,0 +2,48 @@
+Fri Mar 20 20:02:56 UTC 2020 - Johannes Kastl 
+
+- update to 6.7.1:
+  (see installed changelog for the full list of changes)
+  Bug Fixes
+  - Azure: Fixed dropdowns not showing current value. #22914, @torkelo
+  - BackendSrv: only add content-type on POST, PUT requests. #22910, 
@hugohaggmark
+  - Panels: Fixed size issue with panel internal size when exiting panel edit 
mode. #22912, @torkelo
+  - Reporting: fixes migrations compatibility with mysql (Enterprise)
+  - Reporting: Reduce default concurrency limit to 4 (Enterprise)
+
+---
+Fri Mar 20 19:48:29 UTC 2020 - Johannes Kastl 
+
+- update to 6.7.0:
+  (see installed changelog for the full list of changes)
+  Bug Fixes
+  - AngularPanels: Fixed inner height calculation for angular panels . #22796, 
@torkelo
+  - BackendSrv: makes sure provided headers are correctly recognized and set. 
#22778, @hugohaggmark
+  - Forms: Fix input suffix position (caret-down in Select) . #22780, @torkelo
+  - Graphite: Fixed issue with query editor and next select metric now showing 
after selecting metric node . #22856, @torkelo
+  - Rich History: UX adjustments and fixes. #22729, @ivanahuckova
+- update to 6.7.0-beta1:
+  Breaking changes
+  -  Slack: Removed Mention setting and instead introduce Mention Users, 
Mention Groups, and Mention Channel. The first two settings require user and 
group IDs, respectively. This change was necessary because the way of 
mentioning via the Slack API changed and mentions in Slack notifications no 
longer worked.
+  -  Alerting: Reverts the behavior of diff and percent_diff to not always be 
absolute. Something we introduced by mistake in 6.1.0. Alerting now support 
diff(), diff_abs(), percent_diff() and percent_diff_abs(). #21338
+
+  - Notice about changes in backendSrv for plugin authors
+In our mission to migrate away from AngularJS to React we have removed all 
AngularJS dependencies in the core data retrieval service backendSrv.
+Removing the AngularJS dependencies in backendSrv has the unfortunate side 
effect of AngularJS digest no longer being triggered for any request made with 
backendSrv. Because of this, external plugins using backendSrv directly may 
suffer from strange behaviour in the UI.
+To remedy this issue, as a plugin author you need to trigger the digest 
after a direct call to backendSrv.
+  Bug Fixes
+API: Fix redirect issues. #22285, @papagian
+Alerting: Don't include image_url field with Slack message if empty. 
#22372, @aknuds1
+Alerting: Fixed bad background color for default notifications in alert 
tab . #22660, @krvajal
+Annotations: In table panel when setting transform to annotation, they 
will now show up right away without a manual refresh. #22323, @krvajal
+Azure Monitor: Fix app insights source to allow for new __timeFrom and 
__timeTo. #21879, @ChadNedzlek
+BackendSrv: Fixes POST body for form data. #21714, @hugohaggmark
+CloudWatch: Credentials cache invalidation fix. #22473, @sunker
+CloudWatch: Expand alias variables when query yields no result. #22695, 
@sunker
+Dashboard: Fix bug with NaN in alerting. #22053, @a-melnyk
+Explore: Fix display of multiline logs in log panel and explore. #22057, 
@thomasdraebing
+Heatmap: Legend color range is incorrect when using custom min/max. 
#21748, @sv5d
+Security: Fixed XSS issue in dashboard history diff . #22680, @torkelo
+StatPanel: Fixes base color is being used for null values .
+#22646, @torkelo
+
+---

Old:

  grafana-6.6.2.tar.gz

New:

  grafana-6.7.1.tar.gz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.3J692Y/_old  2020-03-26 23:35:20.942819993 +0100
+++ /var/tmp/diff_new_pack.3J692Y/_new  2020-03-26 23:35:20.942819993 +0100
@@ -26,7 +26,7 @@
 %endif
 
 Name:   grafana
-Version:6.6.2
+Version:6.7.1
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.3J692Y/_old  2020-03-26 23:35:20.990820010

commit grafana for openSUSE:Factory

2020-03-19 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2020-03-19 19:51:05

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.3160 (New)


Package is "grafana"

Thu Mar 19 19:51:05 2020 rev:6 rq:786361 version:6.6.2

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2019-12-05 
17:39:38.685346049 +0100
+++ /work/SRC/openSUSE:Factory/.grafana.new.3160/grafana.changes
2020-03-19 19:54:16.984277644 +0100
@@ -1,0 +2,63 @@
+Fri Mar 06 06:20:34 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.6.2:
+  (see installed changelog for the full list of changes)
+
+---
+Fri Mar 06 06:15:10 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.6.1:
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 21:21:34 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.6.0:
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 21:08:39 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.5.3:
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 20:59:13 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.5.2:
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 20:54:08 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.5.1:
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 20:38:10 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.5.0
+  (see installed changelog for the full list of changes)
+
+---
+Thu Mar 05 20:29:16 UTC 2020 - ka...@b1-systems.de
+
+- Update to version 6.4.5:
+  * Create version 6.4.5
+  * CloudWatch: Fix high CPU load (#20579)
+
+---
+Thu Mar 05 20:22:10 UTC 2020 - ka...@b1-systems.de
+
+- add obs-service-go_modules to download required modules into vendor.tar.gz
+- adjusted spec file to use vendor.tar.gz
+- adjusted Makefile to work with new filenames
+- BuildRequire go1.14
+- Update to version 6.4.4:
+  * DataLinks: Fix blur issues. #19883, @aocenas
+  * Docker: Makes it possible to parse timezones in the docker image. #20081, 
@xlson
+  * LDAP: All LDAP servers should be tried even if one of them returns a 
connection error. #20077, @jongyllen
+  * LDAP: No longer shows incorrectly matching groups based on role in debug 
page. #20018, @xlson
+  * Singlestat: Fix no data / null value mapping . #19951, @ryantxu
+
+---

Old:

  grafana-6.4.3.tar.xz

New:

  grafana-6.6.2.tar.gz
  vendor.tar.gz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.BdUgZ8/_old  2020-03-19 19:54:18.348277692 +0100
+++ /var/tmp/diff_new_pack.BdUgZ8/_new  2020-03-19 19:54:18.348277692 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grafana
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,23 +26,24 @@
 %endif
 
 Name:   grafana
-Version:6.4.3
+Version:6.6.2
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0
 Group:  System/Monitoring
 URL:http://grafana.org/
-Source: %{name}-%{version}.tar.xz
-Source1:%{name}-rpmlintrc
+Source: %{name}-%{version}.tar.gz
+Source1:vendor.tar.gz
+Source2:%{name}-rpmlintrc
 # Instructions on the build process
-Source2:README
+Source3:README
 # Makefile to automate build process
-Source3:Makefile
+Source4:Makefile
 BuildRequires:  fdupes
-BuildRequires:  go >= 1.11
+BuildRequires:  git-core
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
-Requires(post): %insserv_prereq
+BuildRequires:  ( go >= 1.14 with go < 1.15 )
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q -n grafana-%{version}
+%setup -q -T -D -a 1 -n grafana-%{version}
 
 %build
 %goprep github.com/grafana/grafana
@@ -64,7 +66,7 @@
 # (The %%gobuild macro can't take quoted strings; they get split up when

commit grafana for openSUSE:Factory

2019-12-05 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2019-12-05 17:37:12

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.4691 (New)


Package is "grafana"

Thu Dec  5 17:37:12 2019 rev:5 rq:754453 version:6.4.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2019-09-11 
10:34:00.299320414 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.4691/grafana.changes
2019-12-05 17:39:38.685346049 +0100
@@ -1,0 +2,165 @@
+Tue Dec 03 15:09:41 UTC 2019 - witold.be...@suse.com
+
+- Revert the spec file and make script
+- Remove PhantomJS dependency
+
+---
+Wed Oct 16 19:29:48 UTC 2019 - ec...@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 - ec...@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
+-

commit grafana for openSUSE:Factory

2019-09-11 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2019-09-11 10:33:55

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.7948 (New)


Package is "grafana"

Wed Sep 11 10:33:55 2019 rev:4 rq:729691 version:6.3.5

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2019-08-20 
10:59:32.456654388 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.7948/grafana.changes
2019-09-11 10:34:00.299320414 +0200
@@ -1,0 +2,19 @@
+Thu Sep 05 08:07:21 UTC 2019 - simon.cr...@grafana.com
+
+- Version 6.3.5
+  * Upgrades
++ Build: Upgrade to go 1.12.9. 
+  * Bug Fixes
++ Dashboard: Fixes dashboards init failed loading error for dashboards 
with panel links that had missing properties. 
++ Editor: Fixes issue where only entire lines were being copied.
++ Explore: Fixes query field layout in splitted view for Safari browsers. 
++ LDAP: multildap + ldap integration. 
++ Profile/UserAdmin: Fix for user agent parser crashes grafana-server on 
32-bit builds. 
++ Prometheus: Prevents panel editor crash when switching to Prometheus 
datasource. 
++ Prometheus: Changes brace-insertion behavior to be less annoying. 
+
+- Version 6.3.4 
+  * Security: CVE-2019-15043 - Parts of the HTTP API allow unauthenticated 
use.  
+
+
+---

Old:

  grafana-6.3.3.tar.xz

New:

  grafana-6.3.5.tar.xz



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.1qIsoR/_old  2019-09-11 10:34:02.227319854 +0200
+++ /var/tmp/diff_new_pack.1qIsoR/_new  2019-09-11 10:34:02.231319853 +0200
@@ -28,7 +28,7 @@
 %bcond_with phantomjs
 
 Name:   grafana
-Version:6.3.3
+Version:6.3.5
 Release:0
 Summary:Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:Apache-2.0

++ _service ++
--- /var/tmp/diff_new_pack.1qIsoR/_old  2019-09-11 10:34:02.283319838 +0200
+++ /var/tmp/diff_new_pack.1qIsoR/_new  2019-09-11 10:34:02.283319838 +0200
@@ -3,8 +3,8 @@
 https://github.com/grafana/grafana
 git
 .git
-6.3.3
-v6.3.3
+6.3.5
+v6.3.5
 enable
   
   

++ _servicedata ++
--- /var/tmp/diff_new_pack.1qIsoR/_old  2019-09-11 10:34:02.299319833 +0200
+++ /var/tmp/diff_new_pack.1qIsoR/_new  2019-09-11 10:34:02.299319833 +0200
@@ -1,6 +1,6 @@
 
   
 https://github.com/grafana/grafana
-84d0a71b25a949fde79a7054241a28d2f2e25999
+67bad726f12efb21893c75c141f2330a4a3cbe2a
   
 
\ No newline at end of file

++ grafana-6.3.3.tar.xz -> grafana-6.3.5.tar.xz ++
/work/SRC/openSUSE:Factory/grafana/grafana-6.3.3.tar.xz 
/work/SRC/openSUSE:Factory/.grafana.new.7948/grafana-6.3.5.tar.xz differ: char 
26, line 1

commit grafana for openSUSE:Factory

2019-08-20 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2019-08-20 10:59:27

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.22127 (New)


Package is "grafana"

Tue Aug 20 10:59:27 2019 rev:3 rq:724600 version:6.3.3

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2019-08-09 
16:54:08.201457876 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.22127/grafana.changes   
2019-08-20 10:59:32.456654388 +0200
@@ -1,0 +2,108 @@
+Fri Aug 16 14:16:42 UTC 2019 - simon.cr...@grafana.com
+
+- Version 6.3.3 
+  * Bug Fixes
++ Annotations: Fix failing annotation query when time series query is 
cancelled. #18532 1, @dprokop 1 
++ Auth: Do not set SameSite cookie attribute if cookie_samesite is none. 
#18462 1, @papagian 3 
++ DataLinks: Apply scoped variables to data links correctly. #18454 1, 
@dprokop 1 
++ DataLinks: Respect timezone when displaying datapoint’s timestamp in 
graph context menu. #18461 2, @dprokop 1 
++ DataLinks: Use datapoint timestamp correctly when interpolating 
variables. #18459 1, @dprokop 1 
++ Explore: Fix loading error for empty queries. #18488 1, @davkal 
++ Graph: Fixes legend issue clicking on series line icon and issue with 
horizontal scrollbar being visible on windows. #18563 1, @torkelo 2 
++ Graphite: Avoid glob of single-value array variables . #18420, @gotjosh 
++ Prometheus: Fix queries with label_replace remove the $1 match when 
loading query editor. #18480 5, @hugohaggmark 3 
++ Prometheus: More consistently allows for multi-line queries in editor. 
#18362 2, @kaydelaney 2 
++ TimeSeries: Assume values are all numbers. #18540 4, @ryantxu 
+
+- Version 6.3.2
+  * Bug Fixes
++ Gauge/BarGauge: Fixes issue with losts thresholds and issue loading 
Gauge with avg stat. #18375 12 
+
+- Version 6.3.1
+  * Bug Fixes
++ PanelLinks: Fix crash issue Gauge & Bar Gauge for panels with panel 
links (drill down links). #18430 2 
+
+- Version 6.3.0
+  * Features / Enhancements
++ OAuth: Do not set SameSite OAuth cookie if cookie_samesite is None. 
#18392 4, @papagian 3 
++ Auth Proxy: Include additional headers as part of the cache key. #18298 
6, @gotjosh 
++ Build grafana images consistently. #18224 12, @hassanfarid 
++ Docs: SAML. #18069 11, @gotjosh 
++ Permissions: Show plugins in nav for non admin users but hide plugin 
configuration. #18234 1, @aocenas 
++ TimePicker: Increase max height of quick range dropdown. #18247 2, 
@torkelo 2 
++ Alerting: Add tags to alert rules. #10989 13, @Thib17 1 
++ Alerting: Attempt to send email notifications to all given email 
addresses. #16881 1, @zhulongcheng 
++ Alerting: Improve alert rule testing. #16286 2, @marefr 
++ Alerting: Support for configuring content field for Discord alert 
notifier. #17017 2, @jan25 
++ Alertmanager: Replace illegal chars with underscore in label names. 
#17002 5, @bergquist 1 
++ Auth: Allow expiration of API keys. #17678, @papagian 3 
++ Auth: Return device, os and browser when listing user auth tokens in 
HTTP API. #17504, @shavonn 1 
++ Auth: Support list and revoke of user auth tokens in UI. #17434 2, 
@shavonn 1 
++ AzureMonitor: change clashing built-in Grafana variables/macro names for 
Azure Logs. #17140, @shavonn 1 
++ CloudWatch: Made region visible for AWS Cloudwatch Expressions. #17243 
2, @utkarshcmu 
++ Cloudwatch: Add AWS DocDB metrics. #17241, @utkarshcmu 
++ Dashboard: Use timezone dashboard setting when exporting to CSV. #18002 
1, @dehrax 
++ Data links. #17267 11, @torkelo 2 
++ Docker: Switch base image to ubuntu:latest from debian:stretch to avoid 
security issues… #17066 5, @bergquist 1 
++ Elasticsearch: Support for visualizing logs in Explore . #17605 7, 
@marefr 
++ Explore: Adds Live option for supported datasources. #17062 1, 
@hugohaggmark 3 
++ Explore: Adds orgId to URL for sharing purposes. #17895 1, @kaydelaney 2 
++ Explore: Adds support for new loki ‘start’ and ‘end’ params for labels 
endpoint. #17512, @kaydelaney 2 
++ Explore: Adds support for toggling raw query mode in explore. #17870, 
@kaydelaney 2 
++ Explore: Allow switching between metrics and logs . #16959 2, @marefr 
++ Explore: Combines the timestamp and local time columns into one. #17775, 
@hugohaggmark 3 
++ Explore: Display log lines context . #17097, @dprokop 1 
++ Explore: Don’t parse log levels if provided by field or label. #17180 1, 
@marefr 
++ Explore: Improves performance of Logs element by limiting re-rendering. 
#17685, @kaydelaney 2 
++ Explore: Support for new LogQL filtering syntax. #16674 4, @davkal 
++ Explore: Use new TimePicker from Grafana/UI. #17793,

commit grafana for openSUSE:Factory

2019-08-09 Thread root

Hello community,

here is the log from the commit of package grafana for openSUSE:Factory checked 
in at 2019-08-09 16:54:03

Comparing /work/SRC/openSUSE:Factory/grafana (Old)
 and  /work/SRC/openSUSE:Factory/.grafana.new.9556 (New)


Package is "grafana"

Fri Aug  9 16:54:03 2019 rev:2 rq:721810 version:6.2.5

Changes:

--- /work/SRC/openSUSE:Factory/grafana/grafana.changes  2019-07-22 
12:19:20.219680952 +0200
+++ /work/SRC/openSUSE:Factory/.grafana.new.9556/grafana.changes
2019-08-09 16:54:08.201457876 +0200
@@ -1,0 +2,5 @@
+Tue Jul 30 14:14:38 CEST 2019 - r...@suse.de
+
+- make phantomjs dependency configurable 
+
+---

Old:

  Makefile

New:

  Makefile.no_phantomjs
  Makefile.phantomjs



Other differences:
--
++ grafana.spec ++
--- /var/tmp/diff_new_pack.OMVkE5/_old  2019-08-09 16:54:08.949457696 +0200
+++ /var/tmp/diff_new_pack.OMVkE5/_new  2019-08-09 16:54:08.953457696 +0200
@@ -25,6 +25,8 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
+%bcond_with phantomjs
+
 Name:   grafana
 Version:6.2.5
 Release:0
@@ -37,13 +39,18 @@
 # Instructions on the build process
 Source2:README
 # Makefile to automate build process
-Source3:Makefile
+Source3:Makefile.no_phantomjs
+Source4:Makefile.phantomjs
 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
@@ -54,6 +61,11 @@
 
 %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
@@ -98,6 +110,17 @@
 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).

++ Makefile.no_phantomjs ++
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 && \
# patch frontend html template to remove phantomjs dependant link \
sed -i 's/.*<\/a>//g' 
public/app/features/dashboard/components/ShareModal/template.html && \
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 && \
# 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 .. && \
xz $$tar && \
rm -rf $$tmpdir
++ Makefile.phantomjs ++
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

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

commit grafana for openSUSE:Factory

12 matches

Site Navigation

Mail list logo

Footer information