public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,898 Commits 655 Branches 650 Tags
1b92bc62cbdbe2cabdd2c43bd1ae198f9cdeb57d
Commit Graph
17898 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 1b92bc62cb edit mode styling 2018-11-22 12:19:52 +01:00
Torkel Ödegaard d70dfd5fd7 edit mode styling 2018-11-22 12:13:28 +01:00
Torkel Ödegaard 547044b65f style tweaks 2018-11-22 11:41:33 +01:00
Torkel Ödegaard 9a2b2863fb styling progress 2018-11-22 08:46:54 +01:00
Torkel Ödegaard c7e296307a panel edit ux experiments 2018-11-21 20:32:04 +01:00
ijin08 e47fc40b13 added icons for panel-edit side menu 2018-11-21 16:05:01 +01:00
Johannes Schill 1a7b8a3931 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-21 11:39:57 +01:00
Johannes Schill 69e5584d39 react-panel: Avoid duplicate keys 2018-11-20 17:11:47 +01:00
Torkel Ödegaard 874ff4a7af Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 17:10:38 +01:00
Torkel Ödegaard 9baa54e98c added alert tab to new react panel editor 2018-11-20 17:09:47 +01:00
Johannes Schill 97f7a7fbba react-panel: Add data source "options". Needs UX, WIP. 2018-11-20 16:33:26 +01:00
Torkel Ödegaard 51e719493b Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 16:07:11 +01:00
Torkel Ödegaard 5ea34844ba fixes to view mode for panels, can now go back as before 2018-11-20 16:00:19 +01:00
Johannes Schill bc9f3a33fe Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-20 14:17:46 +01:00
Johannes Schill ff87cbd4db react-panel: Add data source "help" 2018-11-20 14:17:03 +01:00
Torkel Ödegaard 5402a0e00d fixed menu to go to panel view mode 2018-11-20 13:18:48 +01:00
Torkel Ödegaard 3b76d9ee17 minor style update 2018-11-20 11:26:01 +01:00
Torkel Ödegaard 0575307786 added header section to legacy tabs 2018-11-20 11:06:36 +01:00
Torkel Ödegaard 7f46b75330 Merge branch 'develop' into panel-edit-in-react 2018-11-20 09:51:06 +01:00
Torkel Ödegaard 649d727805 Merge branch 'master' into develop 2018-11-20 09:47:23 +01:00
Marcus Efraimsson cab2c5189a Merge pull request #14129 from daktari/master 
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
 2018-11-20 00:42:22 -08:00
Torkel Ödegaard f44e634da4 switch slider changes 2018-11-20 09:39:56 +01:00
Leonard Gram 1a554e2421 linters. 2018-11-20 09:01:52 +01:00
Leonard Gram 7e2298ce31 build: correct filters for ge build artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram 84832cb6cb build: releaser supports releasing only some artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram 87707c964c Revert "docs: building Grafana on arm." 
Further work-arounds are needed to make this work.
This reverts commit 8a2de58728.
 2018-11-20 08:46:09 +01:00
Javier 0900470dda Add Cloudwatch/CloudHSM Metrics and dimensionMaps 2018-11-19 18:10:34 +01:00
Marcus Efraimsson 9af5e9a448 Merge pull request #14127 from grafana/team_members_fix 
Remove react warning in team members page
 2018-11-19 09:03:41 -08:00
Marcus Efraimsson 0aca6f587b remove react warning 2018-11-19 17:54:17 +01:00
Torkel Ödegaard 571cfab923 added chekbox and other tweaks 2018-11-19 17:41:48 +01:00
Leonard Gram 8a2de58728 docs: building Grafana on arm. 2018-11-19 16:50:19 +01:00
Torkel Ödegaard 808a0aa6f0 Merge branch 'develop' into switch-slider-test 2018-11-19 16:48:16 +01:00
Torkel Ödegaard 1e7a23b0f1 Merge remote-tracking branch 'origin/12759-description-n-links' into develop 2018-11-19 16:47:29 +01:00
David 5a759a8317 Merge pull request #14118 from grafana/davkal/explore-logs-dedup 
Explore: POC dedup logging rows
 2018-11-19 15:36:26 +00:00
David Kaltschmidt 4771eaba5b Explore: POC dedup logging rows 
- added dedup switches to logs view
- strategy 'exact' matches rows that are exact (except for dates)
- strategy 'numbers' strips all numbers
- strategy 'signature' strips all letters and numbers to that only whitespace and punctuation remains
- added duplication indicator next to log level
 2018-11-19 16:26:47 +01:00
David d4e792dccd Merge pull request #14107 from grafana/davkal/explore-panel 
Explore: collapsible result panels
 2018-11-19 15:17:05 +00:00
David c20c787b62 Merge pull request #14104 from grafana/davkal/prometheus-rule-expansion 
Prometheus: fix rules expansion
 2018-11-19 15:11:09 +00:00
Marcus Efraimsson 0d30f3ba52 update snapshot 2018-11-19 14:57:34 +01:00
Marcus Efraimsson ebadcdb535 changelog: add notes about closing #13352 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson f5dfaacee3 changelog: add notes about closing #13810 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 34746e42ef changelog: add notes about closing #13605 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson dbb7396c77 changelog: add notes about closing #13876 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 8246ee343c changelog: add notes about closing #13946 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson a77c86169e changelog: add notes about closing #13555 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 1a64b44c91 changelog: add notes about closing #13425 
[skip ci]
 2018-11-19 14:50:39 +01:00
Marcus Efraimsson 3c91e4de56 changelog: add notes about closing #13655 
[skip ci]
 2018-11-19 14:50:39 +01:00
Leonard Gram abd796c65f Merge pull request #14122 from xlson/publisher-rhel-final-aware 
Corrects an issue where nightly rpms would be misstagged.
 2018-11-19 14:43:02 +01:00
Torkel Ödegaard c67b55776c Merge pull request #14123 from grafana/switch-back-from-mixed 
fixed issue switching back from mixed data source
 2018-11-19 14:40:37 +01:00
Johannes Schill 00596f0afc react-panel: Finish the data source search on query tab and start moving switch-data-source-logic from angular 2018-11-19 14:35:16 +01:00
Leonard Gram b041ad4134 linter. 2018-11-19 14:32:39 +01:00