public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
joe miller a6554a85c0 grammar fix in docs 2016-07-02 08:27:31 -07:00
Carl Bergquist c047dacf18 Merge pull request #5442 from mtanda/snapshot_orig_url 
(snapshot) save original url
 2016-07-01 13:09:34 -07:00
Mitsuhiro Tanda 630d0d0793 (snapshot) add open original dashboard button 2016-07-02 02:26:27 +09:00
Kimmo Huoman 522a3408e9 Export CSV in the same format as presented in Table panel. Fixes issue #5372. 
The data is exported in the same exact format as presented in the table panel.
This is achieved by using the same renderer as the UI uses.
 2016-07-01 20:21:53 +03:00
Mitsuhiro Tanda cc519adcfc (snapshot) restrict saving original url for local snapshot 2016-07-02 02:16:23 +09:00
Mitsuhiro Tanda 7aaa15ad95 (snapshot) save original url 2016-07-02 02:16:23 +09:00
bergquist 07e522bb64 Merge branch 'influxdb_stop_hidden_queries' 2016-07-01 02:09:40 +02:00
bergquist 22ba51a631 Merge branch 'master' into influxdb_stop_hidden_queries 2016-07-01 02:09:10 +02:00
bergquist b47a307106 Merge branch 'master' into influxdb_stop_hidden_queries 2016-07-01 02:06:19 +02:00
Andris Raugulis 1c293781e3 Log to default log directory, only if custom configuration failed. (#5393) 2016-06-30 16:37:06 -07:00
Kevin Fitzpatrick f2baa5b210 Make Generic OAuth Configs ENV VARS-friendly 
Use underscores instead of dashes.
 2016-06-30 15:07:55 -07:00
Kevin Fitzpatrick b4646b6c3a Allow users to use a generic oauth that conforms to the github style. 
Enables users to set their own link text.
 2016-06-30 15:07:55 -07:00
Carl Bergquist 603e5fe0bf Merge pull request #5469 from stuartnelson3/create-unique-prometheus-req-id 
[prometheus] Use `panelId` and `target.refId` for requestId
 2016-06-30 13:13:01 -07:00
stuart nelson 0590c51524 [prometheus] Use panelId and target.refId for requestId 
Using these two values ties requests to a
particular query position within a panel, ensuring
that requests are canceled if:

- Duplicate requests with the same query are sent
- Requests from the same query position (but a
different query) are sent

The last point is important as it identifies
queries by a physical location in the dashboard
instead of with the query expression.  If a
different query from the same position in a panel
is sent, the previous request should be canceled.
 2016-06-30 11:29:02 +02:00
Nozomi Anzai bdf68b2183 Fix wrong overwrite of commit:711992c8e2e811abd450cb665008bb0a1b3e29a9 2016-06-30 10:48:39 +09:00
Torkel Ödegaard 5676a35d9a fix(css): added responsive media query for phones that fix header wrap 2016-06-29 14:35:58 -07:00
Torkel Ödegaard ae8fabdad3 fix(modal): fixed duplicate confirm modal issue 2016-06-29 14:26:21 -07:00
Carl Bergquist b289497db6 Merge pull request #5455 from rakotomandimby/patch-1 
Update debian.md to Debian Jessie
 2016-06-29 12:35:32 -07:00
Carl Bergquist fe7438c7ff Merge pull request #5461 from mtanda/pr_cloudwatch_add_metrics 
(cloudwatch) add metrics
 2016-06-29 12:08:44 -07:00
Carl Bergquist 7b84c4b4dc Merge pull request #5465 from tmc/patch-1 
properly quote font-family on singlestat
 2016-06-29 12:07:53 -07:00
Travis Cline bca6101609 properly quote font-family on singlestat 2016-06-29 11:03:07 -07:00
Soulou aa064b18e8 Test environment override for secret and url with credentials 2016-06-29 13:49:41 +02:00
Mitsuhiro Tanda 9ca5ba96be reorder metrics/dimensions 2016-06-29 14:11:01 +09:00
Mitsuhiro Tanda 511f8d3213 add cloudwatch metrics and dimensions 2016-06-29 13:55:16 +09:00
bergquist 4fc16c36ed feat(alerting): saves new state when alert updates 2016-06-29 00:05:48 +02:00
Torkel Ödegaard 5a65dc5d23 Merge branch 'alerting' of github.com:grafana/grafana into alerting 2016-06-28 14:04:38 -07:00
Torkel Ödegaard 9b4c0cca07 fix(flot): fixed flot issue introduced in alerting branch 2016-06-28 14:04:29 -07:00
Carl Bergquist 3460c12491 Merge pull request #5454 from Scalingo/node_version_package_json 
Fix node version in package.json
 2016-06-28 14:26:30 -04:00
Soulou e2c5fac9df Predefine url to let the environment variable overrider do its job 2016-06-28 17:45:55 +02:00
Soulou 03d0f11407 Accept URL parameter [database] config 2016-06-28 15:31:34 +02:00
Rakotomandimby Mihamina 16e2c660ac Update debian.md 2016-06-28 15:58:00 +03:00
Soulou 122b0d20a9 Fix node version in package.json 
Value was incoherent since
https://github.com/grafana/grafana/commit/1900c81d9f9507ed4dbd18e95569480dfd0922f7
 2016-06-28 14:36:15 +02:00
Othyus f3a6848710 feat(sidemenu): add style(margin and witdh) for the input and label filter 2016-06-28 08:30:36 +02:00
Othyus 31317abbeb feat(sidemenu): add limit for shown organizations 2016-06-28 08:11:37 +02:00
bergquist 6bf42dde18 tech(alerting): remove some logging 2016-06-27 01:27:30 +02:00
Mitsuhiro Tanda 8af3bb739c refactor 2016-06-26 22:39:34 +09:00
bergquist 4ed6b99d9a Merge branch 'alerting_notifications' into alerting 2016-06-26 04:05:56 +02:00
bergquist af216ecf83 tech(cli): remove loop and head straight for plugindir 2016-06-26 03:47:15 +02:00
bergquist 07be2c89a3 tech(cli): lets use the fact that we have a compiler 2016-06-26 03:47:15 +02:00
bergquist 88e208bddf feat(gf-form): add support for small input fields 2016-06-25 23:30:51 +02:00
Carl Bergquist 92835f0a04 Merge pull request #5434 from saboorian/master 
Escape html chararcters in singlestat renderer
 2016-06-25 20:49:16 +02:00
bergquist aecd487775 Merge branch 'f1yegor-master' 2016-06-25 20:42:38 +02:00
bergquist 241b9ee329 fix(kbn): add calculator for opn,rpm and wpm 2016-06-25 20:42:24 +02:00
bergquist 4cbde7e747 Merge branch 'master' of https://github.com/f1yegor/grafana into f1yegor-master 2016-06-25 20:38:43 +02:00
bergquist 12570bb959 feat(singlestat): add serie name as an value option 
closes #4740
 2016-06-25 20:17:23 +02:00
bergquist 8b8bfa8a17 fix(singlestat): rename seriename scoped var 2016-06-25 20:17:05 +02:00
Torkel Ödegaard b31fccb889 Merge branch 'master' of github.com:grafana/grafana 2016-06-25 17:53:42 +02:00
Carl Bergquist ab104bcfd7 Merge pull request #5401 from alexanderzobnin/issue-4740 
Issue #4740 - able to use $SeriesName variable in prefix of postfix.
 2016-06-25 17:49:44 +02:00
Torkel Ödegaard 35f135f6c2 Merge branch 'master' of github.com:grafana/grafana 2016-06-25 17:46:07 +02:00
Torkel Ödegaard 6dad6241ed docs(): updated changelog 2016-06-25 17:45:39 +02:00