public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,108 Commits 655 Branches 650 Tags
306f0785e122a94de00895ada7866ebedb30277f
Commit Graph
6970 Commits
Author SHA1 Message Date
bergquist 9cebb23e01 dashboards as cfg: revert minor changes 2017-12-07 15:27:01 +01:00
bergquist 74e12c260f dashboards as cfg: move dashboard saving into its own service 2017-12-07 15:27:01 +01:00
bergquist 09cb0f378b dashboards as cfg: minor tweaks 2017-12-07 15:27:01 +01:00
bergquist 93e1d8a19c dashboards as cfg: make dashboard none editable by default 2017-12-07 15:27:01 +01:00
bergquist 7f3a7ea128 dashboards as cfg: more tests 2017-12-07 15:27:01 +01:00
bergquist dc0fb8be06 dashboards as cfg: code cleanup 2017-12-07 15:27:01 +01:00
bergquist d69b63cbc0 dashboards as cfg: read first cfg version 2017-12-07 15:27:01 +01:00
Torkel Ödegaard beb9f8ee74 Merge remote-tracking branch 'origin/master' into develop 2017-12-07 14:14:50 +01:00
Adilet Maratov 50daf7463d Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate. 
How it is solved:
* Take organizations_url field data from user basic data response
* Make another request to get all organization the user is a member of (public membership)
* Authenticate user if appropriate organization found in that list
 2017-12-07 16:13:49 +06:00
Ben Whaley fe88658bdd Resolves grafana/grafana:#9309 2017-12-07 03:43:32 +00:00
Sven Klemm c80eadcdf4 handle native postgres datetime types in annotation queries (#9986) 2017-12-06 18:12:24 +01:00
Sven Klemm 373389c920 treat any text column in timeseries query as metric name unless column (#9985) 
named metric is present
 2017-12-06 18:04:33 +01:00
linux chips 5114b1f792 fixing a few fromattings 2017-12-06 10:32:20 +03:00
Torkel Ödegaard 90bcec8178 nav: updated nav item id for manage dashboards 2017-12-05 12:25:59 +01:00
Torkel Ödegaard 90da964a14 refactoring PR #10068 2017-12-05 12:19:01 +01:00
bergquist 35232a77e6 removes unused properties 
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.

closes #10072
 2017-12-05 08:26:43 +01:00
Alexander Zobnin 4d7ff4de15 move import menu item to the original place 2017-12-04 18:00:22 +03:00
Alexander Zobnin 44ea0ff71d Move import dashboard from modal to the page 2017-12-04 15:55:37 +03:00
linux chips 6f3a62d299 add _tests for mssql data source 2017-12-03 21:56:21 +03:00
linux chips c75f9a1923 MSSQL Data Source 2017-12-02 14:40:12 +03:00
bergquist d6d64c53cd typo 💥 2017-12-01 16:23:55 +01:00
Carl Bergquist 89fb60a956 Merge pull request #10020 from jomenxiao/master 
fix render http[get] params error
 2017-12-01 16:22:47 +01:00
bergquist 9282182805 influxdb: pass tags to alerting from influxdb client 
closes #10046
 2017-12-01 16:16:49 +01:00
bergquist 17bf87fb62 typo 💥 2017-12-01 14:05:47 +01:00
bergquist 7a497fd617 move systemd ready notification to server.go 2017-12-01 14:02:05 +01:00
Torkel Ödegaard 68580f06a3 page header now on 99% of pages 2017-12-01 13:49:15 +01:00
Carl Bergquist 820abef82d Merge pull request #10025 from jgrassler/systemd-sdnotify 
Use systemd notification where applicable
 2017-12-01 13:26:13 +01:00
Torkel Ödegaard 6bff416430 navigation: more progress on new page header 2017-12-01 12:51:46 +01:00
Torkel Ödegaard 75bb894485 ux: new page-header design, most pages beside admin done 2017-12-01 11:32:00 +01:00
Torkel Ödegaard e53b55479a ux: made plugins page work 2017-12-01 10:47:21 +01:00
Johannes Grassler d28ca54129 Use systemd notification where applicable 
With this change in place, the grafana service will signal
readiness to serve by writing "READY=1" to the path specified
through the NOTIFY_SOCKET environment variable. If this
environment variable is not present or empty, no notification
will happen. This notification is the standard systemd
mechanism for indicating a service is ready to serve. For
Grafana this may be a couple of seconds from startup due to
database migrations. This change also adjusts the Grafana
systemd service definition to make use of this feature.
 2017-12-01 10:31:58 +01:00
Torkel Ödegaard 6f5a9bf768 ux: new page header progress 2017-11-30 17:28:24 +01:00
Torkel Ödegaard b2add1977a ux: progress on new page header 2017-11-30 16:35:27 +01:00
Andrei Kalasok 68d4211c50 grafana-10039: fix query time range ends in the past 2017-11-30 15:50:35 +01:00
Torkel Ödegaard 74ceb76ec0 ux: work on page header 2017-11-30 15:37:03 +01:00
Torkel Ödegaard 645f49eda4 ux: updating header design for pages 2017-11-30 11:31:38 +01:00
Marcus Efraimsson 1e10fcad83 test: fix failing postgres test 
Should use case insensitive matching when searching for users
 2017-11-29 15:17:31 +01:00
Daniel Lee 554c7ba96f notifier: Fixes path for uploaded image for Slack notifier 
Fixes #10012
 2017-11-29 11:16:45 +01:00
jomenxiao 3f95180c98 fix render http[get] params error 2017-11-28 22:20:22 +08:00
bergquist c0e087640b test: close file before deleting 2017-11-28 15:05:53 +01:00
Marcus Efraimsson a335150ad1 dashfolders: Add a helper for creating a dashboard folder 2017-11-28 12:51:40 +01:00
Marcus Efraimsson 82cd24491e dashfolders: revert automatic creation of folders for plugins 2017-11-28 12:51:40 +01:00
Marcus Efraimsson 368a4d7aed dashfolders: don't create app folder on dashboard import if already exists 2017-11-27 18:23:57 +01:00
Daniel Lee 4356e980f0 dashfolders: create app folder on dashboard import 2017-11-27 17:08:39 +01:00
Torkel Ödegaard bc81298d4c worked on search 2017-11-24 16:18:56 +01:00
Torkel Ödegaard 93d21bec75 Merge branch 'master' into develop 2017-11-24 09:25:14 +01:00
Torkel Ödegaard b7a8db4937 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-22 14:51:53 +01:00
THIERRY SALLE 658109e0d6 Optimized number of lines fetching in log file initialisation 
Added unit tests for file logging line counting

Remove file after unit test
 2017-11-22 14:25:39 +01:00
Carl Bergquist 79e788e46f Merge pull request #9937 from saady/gcs-path 
[GCS] Support for gcs path
 2017-11-21 19:46:53 +01:00
saady 767b460ff1 [GCS] Support for gcs path 2017-11-21 17:22:40 +00:00