root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity
12,929 Commits 1,395 Branches 636 Tags 2.4 GiB
Commit Graph

12929 Commits

Author SHA1 Message Date
Alexander Zobnin b79017e4a4 graph: fix series sorting issue (#10617) 2018-01-26 09:23:56 +01:00
Carl Bergquist ac2b36c271
Merge pull request #10610 from grafana/phantomjs_fix 
fixes broken phantomjs rendering
 2018-01-25 21:25:02 +01:00
Daniel Lee 4cfe179f47 variables: lint fix 2018-01-25 14:49:51 +01:00
Daniel Lee 8aa55ee352 variables: fix when datasource returns error 2018-01-25 14:16:06 +01:00
bergquist 49673c509d fixes broken phantomjs rendering 
when migrating from govendor to dep we broke the phantomjs rendering.

ref #10602
 2018-01-25 13:27:24 +01:00
Patrick O'Carroll eb2d4b20bc added varibale to table hover, lightend colors for table light theme, fixes #10609 (#10611) 2018-01-25 12:17:16 +01:00
Leonard Gram 1c034b7a73 fixes minor typo 2018-01-25 09:30:37 +01:00
bergquist c3a768b3ed provsioning: dont stop grafana due to missing 2018-01-25 09:30:37 +01:00
Jonathan McCall 579d2b63f8 Disable prefix and postfix font size when gauge mode is enabled (#10573) 
* Disable prefix and postfix font size when gauge mode is enabled

* Use function to hide prefix/postfix size when using gauge

* Rename disableFontSizes to canChangeFontSizes
 2018-01-25 09:27:25 +01:00
bergquist 31a5134a0f docs: improve docs for image uploaders 2018-01-24 22:26:00 +01:00
Carl Bergquist 7c9913cb8a
Merge pull request #10605 from tsvehagen/haproxy-example 
docs: Add haproxy example for running behind reverse-proxy
 2018-01-24 22:03:53 +01:00
bergquist 1508755422 cfg: remove local as default image uploader 
ref #9967
 2018-01-24 21:31:07 +01:00
Tobias Svehagen f129754a96 docs: Add haproxy example for running behind reverse-proxy 2018-01-24 20:03:46 +01:00
hannes 43e6ea95e0 Cloudwatch: add support for multi instances (#10570) 
* cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances.

* cloudwatch: add support for multi instanceIds on call ebs_volume_ids.
 2018-01-24 15:41:42 +01:00
Torkel Ödegaard 889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Leonard Gram 2d090829d8
Merge pull request #10603 from xlson/pruned-deps 
tech: adds/removes in vendor folder according to dep 0.4.0.
 2018-01-24 14:04:56 +01:00
Leonard Gram f6fac03958 tech: adds/removes in vendor folder according to dep 0.4.0. 2018-01-24 14:01:45 +01:00
Marcus Efraimsson 39dd4799f0 docker: sync local time and timezone to mysql_tests block 2018-01-24 11:43:56 +01:00
Marcus Efraimsson d36fd66dba dashfolder: fix for sqlite test 2018-01-24 11:43:08 +01:00
Marcus Efraimsson 1a5dee3c11
Merge pull request #10600 from grafana/mysql_dep_fix 
mysql: pin the mysql dependency
 2018-01-24 11:27:45 +01:00
Daniel Lee 9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
bergquist 6618bff806 mysql: pin the mysql dependency 2018-01-24 11:07:57 +01:00
bergquist d7f6f11eb1 tech: ignore /public and /node_modules 2018-01-24 11:01:27 +01:00
bergquist d36e424fe0 tech: ignore /data folder for dep 2018-01-24 10:50:01 +01:00
bergquist 6a6eab5ea1 plugins: map error property on query result 2018-01-24 10:37:04 +01:00
bergquist ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist 5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
Torkel Ödegaard dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00
Torkel Ödegaard 12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Torkel Ödegaard 3662b03d8f Merge branch 'master' of github.com:grafana/grafana 2018-01-23 13:04:09 +01:00
Torkel Ödegaard dbfaf5dac8 refactor: minor refactoring of PR #10560 2018-01-23 13:03:44 +01:00
hannes d82af23f1c cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances. (#10566) 2018-01-23 12:57:05 +01:00
Torkel Ödegaard a24aa3ae28 Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana 2018-01-23 12:44:27 +01:00
Marcus Efraimsson 1ce6a420cb docker: use mysql and postgres from latest fake-data-gen 2018-01-23 10:51:48 +01:00
Carl Bergquist e24d9a6224
Merge pull request #10584 from bkaganyildiz/update-opsgenie-notifier 
Update OpsGenie Notifier to support different api domains.
 2018-01-23 08:57:13 +01:00
bkaganyildiz 97d969bd5c Update OpsGenie Notifier to support different api domains. 2018-01-22 22:27:35 +03:00
Patrick O'Carroll c611ffa4bc 10583 panel resize icon fix (#10585) 
* removed svg, added ::after

* removed unnecessary code
 2018-01-22 16:49:45 +01:00
Marcus Efraimsson f8a03fa3e3
Merge pull request #10587 from grafana/10580_search_bug 
dashboards: Fix issue with first click when expanding folder in search
 2018-01-22 16:44:31 +01:00
Marcus Efraimsson b5a6a9ab3b dashboards: Fix issue with first click when expanding folder in search 
Fixes #10580
 2018-01-22 16:12:52 +01:00
bergquist 5546828b9f cfg: adds info about local img uploader to docs 2018-01-22 11:11:30 +01:00
bergquist 704a198ffa docs: adds info about local img uploader 2018-01-22 11:09:16 +01:00
bergquist b98dd680e9 changelog: adds note about closing #6922 2018-01-22 11:04:56 +01:00
Carl Bergquist 184e7046df
Merge pull request #10059 from FunkyM/local-image-store 
Add support for internal image store
 2018-01-22 11:03:00 +01:00
bergquist 6780e00c7d changelog: note about closing #9664 2018-01-22 10:47:23 +01:00
Carl Bergquist 89ae4d6685
Merge pull request #9664 from mtanda/prometheus_on_by 
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
 2018-01-22 10:42:20 +01:00
bergquist 9678be15d9 changelog: adds note about closing #9770 2018-01-22 08:16:31 +01:00
Carl Bergquist 27d103adae
Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked 
Disable instead of hide mode options when line/points is unchecked
 2018-01-22 08:11:19 +01:00
Carl Bergquist 397da7a444
Merge pull request #10572 from Jonnymcc/add-lumens-unit 
Add lumens unit
 2018-01-22 07:35:26 +01:00
Jonathan McCall f516c82ddc Disable instead of hide mode options when line/points is unchecked 2018-01-20 19:23:26 -05:00