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
ryan 3aed867b4b fix merge error 2018-03-15 10:35:50 +01:00
ryan 853d9bb378 Merge remote-tracking branch 'grafana/master' into influx-db-query2 
* grafana/master:
  docker: change port for prom random data scrape target
 2018-03-15 10:25:20 +01:00
Corentin Chary 777c1024c9 alertmanager: if there are no alerts to send, do nothing 2018-03-15 10:08:03 +01:00
Marcus Efraimsson d2267643ed Merge branch 'master' into mssql_datasource 2018-03-15 09:53:19 +01:00
Marcus Efraimsson eef01e3703 docker: change port for prom random data scrape target 2018-03-15 09:52:53 +01:00
Marcus Efraimsson 3d0f97aab9 mssql datasource: wip 2018-03-15 09:51:29 +01:00
Marcus Efraimsson ef3588c1f8 docker: mssql and mssql tests blocks with common build context 2018-03-15 09:49:53 +01:00
ryan 1080c113f6 fix lint problems 2018-03-15 00:07:20 +01:00
ryan 1ce3e49e72 fix lint problems 2018-03-15 00:05:15 +01:00
ryan cae9c28f70 fix lint problems 2018-03-15 00:03:47 +01:00
ryan 7a7e407393 fix lint problems 2018-03-15 00:02:38 +01:00
ryan 4f8ee9f5a7 merge with master 2018-03-14 23:52:24 +01:00
Sven Klemm f4006911e0 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-14 23:13:53 +01:00
Sven Klemm 46c229188e read aggregate functions from database 2018-03-14 23:03:32 +01:00
Sven Klemm 0c3afd0e9c add buildAggregateQuery 2018-03-14 22:59:48 +01:00
Carl Bergquist 18e498e0ff Update README.md 
Removes alpha 

closes https://github.com/grafana/grafana/issues/11251
 2018-03-14 21:07:55 +01:00
Marcus Efraimsson 61e1c12fee docker: fake-data-gen:latest updates 
fake-data-gen for elastic 2.4 and 5 blocks, new graphite 1.1+ block.
added big dashboard for graphite 1 and 1.1+ that can be imported to grafana
 2018-03-14 20:47:52 +01:00
ilgizar bd3d17ab8c Merge remote-tracking branch 'upstream/master' into 1271_share_zero 2018-03-14 23:42:58 +05:00
ilgizar 9d7ab78d9f Resolved conflict 2018-03-14 23:39:05 +05:00
bergquist 8efb39ee2b docs: more details about slack notifier 
closes #11059
 2018-03-14 18:26:05 +01:00
Sven Klemm 64fa1ce8a0 properly handle IN queries 2018-03-14 18:09:47 +01:00
bergquist bdf6a75c91 docs: updates latest release for docs 2018-03-14 17:09:02 +01:00
bergquist cf67584998 changelog: improve description of closed issues 2018-03-14 16:06:03 +01:00
Carl Bergquist 105f6ff88c Merge pull request #11249 from bergquist/legacy_render_urls 
Avoid redirecting internal rendering requests
 2018-03-14 15:42:07 +01:00
bergquist 6cac7c2de9 renderer: avoid redirect render requests 
closes #11180
 2018-03-14 15:27:18 +01:00
bergquist e4cca1943c changelog: adds notes about 5.0.2 
[ci skip]
 2018-03-14 15:05:17 +01:00
Carl Bergquist 6d1e3613f7 Merge pull request #11246 from grafana/11227_import 
dashboard: fix import dashboard with alert rule(s)
 2018-03-14 14:38:29 +01:00
Carl Bergquist a8918047a2 Merge pull request #11238 from grafana/11155-mysql-issue 
middleware: recover and retry on session start
 2018-03-14 14:29:47 +01:00
Marcus Efraimsson 87284d284e dashboard: fix import dashboard with alert rule 
Importing a dashboard with alert rule(s) should be possible without receiving invalid
alert data error. This fix reverts the import logic to how it worked before Grafana v5.0,
that is import will allow dashboard with alert rule(s) but no alerts will be created.
After an import the user will need to update the dashboard for the alerts to be created.
Fixes #11227
 2018-03-14 14:24:56 +01:00
Carl Bergquist 0ef94ea403 Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Carl Bergquist a0a57ac33a Merge pull request #11236 from grafana/alerting_collapsed_panels 
alerting: supports extracting alerts from collapsed panels
 2018-03-14 14:16:50 +01:00
Daniel Lee 5f511deefc middleware: recover and retry on session start 
Partial fix for #11155 - the Macaron session middleware
panics if mysql returns an error. This fix recovers from
the panic and retries once
 2018-03-14 12:26:59 +01:00
bergquist be7ec310b1 alerting: supports extracting alerts from collapsed panels 
collapsed rows wrap the hidden rows within itself. This caused
the extractor to miss the panel and therefore delete the alert
accosiated with the graph.

closes #11222
 2018-03-14 11:23:16 +01:00
Sven Klemm 6793fa5e54 join multivalue variables with , 2018-03-13 23:33:40 +01:00
Sven Klemm e6501f0f0e revert special handling for IN 2018-03-13 23:24:26 +01:00
Sven Klemm 5e9a66de5f put values for IN in parens 2018-03-13 23:19:56 +01:00
Sven Klemm 958646d976 dont quote where constraints 2018-03-13 23:15:25 +01:00
Marcus Efraimsson 6503e482e3 docker: add test dashboard for mssql for visualizing data generated by fake-data-gen 2018-03-13 23:07:40 +01:00
Sven Klemm b7c7030a46 add regex operators 2018-03-13 23:06:39 +01:00
Marcus Efraimsson c87752102a mssql datasource: support for timeGroup macro function 2018-03-13 22:49:49 +01:00
flopp999 08461408a2 Added Kilopascals(kPa) under pressure 2018-03-13 22:17:56 +01:00
flopp999 af63a26be0 Added W/m2(energy) and l/h(flow) 
both as .fixedUnit
 2018-03-13 22:11:58 +01:00
Carl Bergquist 9cae6f05b4 Merge pull request #11225 from flopp999/patch-1 
Added icon for iOS web app
 2018-03-13 21:54:55 +01:00
Marcus Efraimsson 91fa076fb3 folders: should be possible to browse folder using only uid 
That is, the slug part of url should be optional.
 2018-03-13 21:32:37 +01:00
Sven Klemm 046ee8efd8 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-13 21:31:43 +01:00
Sven Klemm cdb4e2ba0b remove unused setting 2018-03-13 21:31:07 +01:00
Marcus Efraimsson 5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Marcus Efraimsson 57d46a706c mssql datasource: additional data type tests 2018-03-13 19:54:29 +01:00
Marcus Efraimsson e7b790316e docker: add mssql block 2018-03-13 17:03:10 +01:00
Marcus Efraimsson d4beee2bb0 Merge branch 'master' into mssql_datasource 2018-03-13 16:03:02 +01:00