Compare commits

...

7272 Commits

Author SHA1 Message Date
Daniel Lee 944e526eb9 release 6.1.0-beta1 2019-03-27 12:06:23 +01:00
Daniel Lee 0d6db7e6b8 Chore: scripts update publish script before 6.1 release
(cherry picked from commit cbe2543717894ace2a8347859bff22dfbbf57a73)
2019-03-27 12:02:59 +01:00
Daniel Lee 232b7fd698 Chore: changelog adds note for #16234 2019-03-27 11:46:47 +01:00
Daniel Lee 8a8a1b8e11 Fix: Prometheus regex ad-hoc filters w/ wildcards (#16234)
Fixes #14615.

Removes extra escaping for regex filter values when using ad hoc
filters for Prometheus. The extra escaping causes queries with
regex characters to be invalid.
2019-03-27 11:43:17 +01:00
Daniel Lee bbdc1e6bd8 Chore: changelog notes for #13825,#15205,#14877,#16227 2019-03-27 09:49:23 +01:00
Navaneesh Kumar 5ea823a65a Fix: Alert email variable name typo fixed (#16232) 2019-03-27 09:42:20 +01:00
Daniel Lee 3146500de5 Fix: scripts changelog cli per page set to 100
GitHub pagination was limiting the result to 30 issues.
This fix makes the changelog script return up to 100
issues. Will have to add a loop to fetch more once we
merge more than 100 PR's that should be added to the
changelog.

Also, fixes a bug where issues that were not included
in the milestone were being returned.
2019-03-27 09:38:28 +01:00
Navaneesh Kumar ab541e2e13 Fix: Dashboard history diff & white theme fix (#16231) 2019-03-27 09:24:44 +01:00
Hugo Häggmark 7f9ad77153 Merge pull request #16241 from grafana/hugoh/no-implicit-any
Chore: Eliminate implicit anys in backend_srv
2019-03-27 09:14:16 +01:00
Patrick O'Carroll 2271471826 Chore: Theme consistency, rems => pixels or variables (#16235)
* repalced rems with pixels and variables

* replaced rems with pixels and variables
2019-03-27 09:14:02 +01:00
Patrick O'Carroll 75e3d3e59a Chore: Theme consistency, rems => pixels (#16145)
* replaced rem with pixels or variables

* replaced rems with pixels or variables

* repalced rems with pixels and variables
2019-03-27 08:48:24 +01:00
Daniel Lee 2637c653ef changelog: adds notes for #16229 and #16227 2019-03-26 17:03:08 +01:00
Daniel Lee 462e0d0c6f Fix: Elasticsearch fix template variables in the alias field (#16629)
Fixes #16040

Fix so that a template variable in the alias field is not interpolated on blur and only the value sent in the query is interpolated. Does a deep clone of the options.targets to avoid changing the original alias field.
2019-03-26 16:15:23 +01:00
Torkel Ödegaard c02782c0ec Fix: TablePanel column color style now works even after removeing styles, fixes #16162 (#16227) 2019-03-26 15:18:46 +01:00
Torkel Ödegaard 6ef11872f7 Docs: Updated changelog for 6.1 release (#16224)
* Docs: Updated changelog for 6.1 release

Also Updates the changelog cli task to group issues into bug fixes
and not bug fixes.

* Minor changelog fixes
2019-03-26 13:26:20 +01:00
Marcus Efraimsson 2ae63e70c0 Alerting: Notification channel http api enhancements (#16219)
Now returns uid in response to get notification channel by id.
Adds GET/PUT/DELETE support for notification channel by uid, 
  /api/alert-notifications/uid/:uid.
Break apart alerting and alert notification http api docs in two 
  pages and update documentation to make it up to date
  with current implementation.

Fixes #16012
2019-03-26 18:37:02 +07:00
Daniel Lee 9f58b85693 Merge pull request #16210 from grafana/16187_docs
docs: loki provisioning
2019-03-26 09:46:14 +01:00
Ryan McKinley f963033d2a Upgrades: Patch updates to yarn lock (#16215) 2019-03-26 08:49:09 +01:00
Ryan McKinley 6bec36ea04 Fix: DatasourceApi query response typing fix (#16214) 2019-03-26 08:45:15 +01:00
Marcus Efraimsson 6b8e3122f8 chore(influx): no point of reading response when bad status (#16212)
There's no point in reading the body response without using
the result so removing it.

Fixes #9199
Ref #16207
2019-03-26 12:10:24 +07:00
Marcus Efraimsson 29fc1ed77b docs: loki provisioning 2019-03-26 11:59:12 +07:00
Daniel Lee fda7e686f3 Merge pull request #15205 from seanlaff/12556-oauth-pass-thru
Add oauth pass-thru option for datasources
2019-03-25 21:52:20 +01:00
Andrej Ocenas 516b7ce845 docs(dev): Update docs about devenv dir (#16208)
* Update readmes

* Fix devenv dasboard query

* Update devenv readme

* Add link to devenv from docs
2019-03-25 21:14:24 +01:00
Marcus Efraimsson 6c9b9b360a fix(dashboard): time regions spanning across midnight (#16201)
Fixes #14590
2019-03-25 23:51:10 +07:00
Ramon Carvalho Maciel d791a6211d fix(InfluxDB): Reads body and close request body even for error status codes (#16207) 2019-03-25 17:42:26 +01:00
Ryan McKinley 941b770c46 chore: more TableData to SeriesData renaming (#16206) 2019-03-25 17:30:53 +01:00
Torkel Ödegaard dbc2f2761a fix(panels/graph): Default option name for spaceLength was accidentally changed (#16205) 2019-03-25 17:12:39 +01:00
Dominik Prokop 9655eeda18 fix(explore): only show split close button when split is active (#16203) 2019-03-25 16:44:09 +01:00
Torkel Ödegaard 8ef1c75aa1 fix(react2angular): Fixed react to angular wrapper watching function expressions causing infinte digest loop, fixes #16194 (#16196) 2019-03-25 16:29:09 +01:00
Torkel Ödegaard 7c81f4dfd8 fix(Alerting): Fixed alert rules with eval in day units, fixes #16174 (#16182) 2019-03-25 16:27:58 +01:00
Peter Holmberg 8a396acdb4 fix(panel/table): Fix for white text on white background when value is null 2019-03-25 16:21:07 +01:00
Peter Holmberg 4898502e4e refactor(grafana/ui): Replace <input />with Input component from grafana/ui (#16085)
* replace with Input component from grafana/ui

* removing placeholder classname

* change import

* fix import
2019-03-25 15:53:05 +01:00
Steven Sheehy dd388ed578 fix(loki): Hide empty labels column
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-25 15:23:54 +01:00
Leonard Gram 8dfa1f4c12 build: fixes publishing version. 2019-03-25 15:01:45 +01:00
Ryan McKinley 77b3da3e8b refactor(data models): Renamed TableData to SeriesData (#16185) 2019-03-25 14:46:16 +01:00
Daniel Lee c7d108264d Merge pull request #16137 from mtanda/cloudwatch_update_metrics_list
update cloudwatch metrics/dimensions list
2019-03-25 14:42:15 +01:00
Andrej Ocenas a978e28e7c chore(core/utils): Add typings to datemath.ts (#16195)
* Add typings

* Remove explicit cast
2019-03-25 14:32:55 +01:00
Ryan McKinley e5c8375ec2 only call onPanelMigration when the version actually changes (#16186)
* set the plugin version if there is a migration handler
* only call panel migration if the version changes
* set the version after change also
* avoid NPE... check that we have options
* destroy is based on the previous panel type, not the next one
* Panels: Minor refactoring on panel plugin version code, #16186
2019-03-25 14:10:23 +01:00
Dominik Prokop a8c50ed6ba feat(explore): make it possible to close left pane of split view (#16155)
* feat(explore): make it possible to close left pane of split view

* Use action's type prop instead of enum
2019-03-25 12:49:15 +01:00
Dominik Prokop c2e9daad1e feat(Explore): make sure Loki labels are up to date (#16131)
* Migrated loki syntax and labels logic to useLokiSyntax hook

* Enable loki labels  refresh after specified interval has passed

* Enable periodic loki labels refresh when labels selector is opened

* Fix prettier

* Add react-hooks-testing-library and disable lib check on typecheck

* Add tests for loki syntax/label hooks

* Move tsc's skipLibCheck option to tsconfig for webpack to pick it up

* Set log labels refresh marker variable when log labels fetch start

* Fix prettier issues

* Fix type on activeOption in useLokiLabel hook

* Typo fixes and types in useLokiSyntax hook test fixes

* Make sure effect's setState is not performed on unmounted component

* Extract logic for checking if is component mounted to a separate hook
2019-03-25 12:08:28 +01:00
Leonard Gram cf7a5b552b build: makes sure grafana.version is available when deploying. 2019-03-25 11:40:56 +01:00
Hugo Häggmark d563505dd3 fix: added missing event to function signature
Fixes: #16055
2019-03-25 11:23:59 +01:00
Torkel Ödegaard e578e8d2dc Merge pull request #16189 from grafana/hugoh/explore-graphite-url-not-working
Added target as isMetric property
2019-03-25 10:54:22 +01:00
Leonard Gram f0c6a480cd build: refactoring 2019-03-25 09:48:45 +01:00
Leonard Gram 768c7b6f4a build: updated build container with support for rpi1. 2019-03-25 09:48:45 +01:00
Leonard Gram ff977331f4 build: support for publishing armv6. 2019-03-25 09:48:45 +01:00
Leonard Gram 6e802dc94d build: builds armv6 with rpi1 compat gcc. 2019-03-25 09:48:45 +01:00
Hugo Häggmark b42dec7353 fix: added target and datasource as isMetric property
Fixes: #15862
2019-03-25 09:08:17 +01:00
Torkel Ödegaard 35965e0efd Merge pull request #16184 from grafana/remove-implicit-anys-progress
chore: Removed implicit anys in react container and test helpers
2019-03-25 07:50:00 +01:00
Torkel Ödegaard e3d33e6c4a chore: Removed implicit anys in react container and test helpers 2019-03-24 20:27:12 +01:00
Torkel Ödegaard 090b3f6c6d Merge pull request #16166 from ryantxu/drop-panel-plugin-setters
Refactor ReactPanelPlugin change hooks -> handler & add panel version to json
2019-03-24 19:07:06 +01:00
Torkel Ödegaard 7b97565550 Merge branch 'master' into drop-panel-plugin-setters 2019-03-24 18:37:14 +01:00
Torkel Ödegaard f4f5eeeb18 Pamels: Options are always there 2019-03-24 18:34:43 +01:00
Torkel Ödegaard e03c7bf1a3 Panels: Support angular -> react migration via PanelMigrationHandler 2019-03-24 17:11:00 +01:00
Torkel Ödegaard 20fec4d261 Panels: Added more tests for change panel plugin 2019-03-24 16:39:55 +01:00
Torkel Ödegaard 0d55141a2d Panels: Refactoring how panel plugins sets hooks and components, #16166 2019-03-24 15:56:32 +01:00
Marcus Efraimsson 24ad47aa64 Merge pull request #16179 from paulfantom/patch-1
clarify notifications API docs
2019-03-24 18:22:25 +07:00
Paweł Krupa 2a207d6970 clarify notifications API docs 2019-03-24 11:49:20 +01:00
Torkel Ödegaard 292f54ba37 Merge branch 'drop-panel-plugin-setters' of https://github.com/ryantxu/grafana into ryantxu-drop-panel-plugin-setters 2019-03-24 07:54:07 +01:00
Torkel Ödegaard 5572323581 Merge pull request #16173 from ryantxu/no-process-timeseries
remove TimeSeriesStats and processTimeSeries
2019-03-24 07:43:06 +01:00
ryan e48767a14a remove processTimeSeries 2019-03-23 13:18:00 -07:00
ryan d6ae76c8a3 merge master 2019-03-23 13:13:09 -07:00
ryan 009cd086aa merge master 2019-03-23 13:07:46 -07:00
Torkel Ödegaard 5d1450dee1 Merge branch 'master' into no-process-timeseries 2019-03-23 17:59:20 +01:00
Torkel Ödegaard 4db914578c Merge pull request #16171 from ryantxu/pie-display
use displayValue in pie chart
2019-03-23 17:57:05 +01:00
Torkel Ödegaard 0d62d1b47f Merge pull request #16172 from ryantxu/rename-stat-to-show
rename stat to show in UI
2019-03-23 17:56:04 +01:00
Torkel Ödegaard fa81ba8ffc Merge pull request #16165 from ryantxu/rename-float-test
renamed floatPairs.test.ts
2019-03-23 07:24:21 +01:00
ryan 65476d4044 don't use process timeseries 2019-03-22 15:40:17 -07:00
ryan 56e1528c0e rename stat to show in UI 2019-03-22 15:23:51 -07:00
ryan 2e079659f8 use display value in pie chart 2019-03-22 15:16:04 -07:00
ryan 6da2f132c7 keep plugin versions 2019-03-22 13:45:09 -07:00
ryan 82be27a42a remove panel plugin setters 2019-03-22 13:12:35 -07:00
ryan 47b3fc5e63 renamed float to flot 2019-03-22 12:48:16 -07:00
Torkel Ödegaard 0f0f76b602 Merge pull request #15938 from ryantxu/table-reducer
Calculate stats on TableData
2019-03-22 20:44:05 +01:00
ryan f9fb1210e9 prevOptions should be optional 2019-03-22 10:55:31 -07:00
ryan d8595e9f4e moved migration hook to its own function 2019-03-22 10:22:25 -07:00
Torkel Ödegaard a6c2a8c3cc Merge branch 'master' into table-reducer 2019-03-22 15:55:21 +01:00
Torkel Ödegaard beba9676f6 Minor refactoring of stats picker / shared singlestat code 2019-03-22 15:25:33 +01:00
Hugo Häggmark eedbc485dd Makes it possible to navigate back/forward with browser buttons in Explore (#16150)
Make it possible to navigate back/forward with browser buttons in Explore
2019-03-22 15:24:30 +01:00
Torkel Ödegaard bfc54b6424 Merge pull request #16134 from grafana/auto-decimals-graph-panels
Auto decimals react singlestat panels
2019-03-22 14:57:15 +01:00
Torkel Ödegaard dba64a4e88 Moved DisplayValueOptions type back, #16134 2019-03-22 14:33:17 +01:00
Torkel Ödegaard 7cae6d5271 Merge pull request #16149 from grafana/graphite-variable-quoting
Graphite: fixed variable quoting when variable value is nummeric
2019-03-22 13:39:48 +01:00
Torkel Ödegaard 0ece3abbd0 Merge pull request #16152 from grafana/mtanda-prometheus_annotation_deduplication
Prometheus: Dedup annotations events with same timestamp
2019-03-22 13:38:47 +01:00
Torkel Ödegaard e0ecbc4c68 Merge branch 'table-reducer' of https://github.com/ryantxu/grafana into ryantxu-table-reducer 2019-03-22 13:36:49 +01:00
Peter Holmberg 5a5aed10a1 adding check for decimals 2019-03-22 13:35:40 +01:00
Peter Holmberg 94d129e479 add one more test 2019-03-22 13:07:39 +01:00
Torkel Ödegaard 10d46bb61c Merge pull request #16144 from markelog/license-2
Link license corrections
2019-03-22 13:00:22 +01:00
Torkel Ödegaard 732ea8eea5 Graphite: fixed variable quoting when variable value is nummeric, fixes #2078 2019-03-22 12:57:07 +01:00
Torkel Ödegaard d5a56b0bed Minor refactoring of #16127 2019-03-22 12:51:12 +01:00
Torkel Ödegaard c7c0ba5a5a Merge branch 'prometheus_annotation_deduplication' of https://github.com/mtanda/grafana into mtanda-prometheus_annotation_deduplication 2019-03-22 12:45:46 +01:00
Torkel Ödegaard a0d2e5861d Merge pull request #16136 from grafana/rem-removal-2
Replaced rems with pixels or variables (part 2)
2019-03-22 12:30:06 +01:00
Torkel Ödegaard 31dc3cfcf4 Merge pull request #16111 from grafana/graphite-series-by-tag-issue
Graphite: Fixed issue with using series ref and series by tag
2019-03-22 12:24:40 +01:00
Torkel Ödegaard 229d73b609 Update provisioning.md 2019-03-22 11:49:27 +01:00
Torkel Ödegaard 50a10706b0 Graphite: Fixed issue with using series ref and series by tag, fixes #15237 2019-03-22 11:42:09 +01:00
Peter Holmberg 08a4c9f6fa move typings to types, 2019-03-22 10:42:17 +01:00
Oleg Gaidarenko 8ac5c91004 Link license corrections
Follow-up for 7316bdc99f
2019-03-22 09:52:09 +01:00
Torkel Ödegaard 46a75099d8 Merge pull request #16116 from SGI495/master
Don't include non-existing image in MS Teams alert
2019-03-22 09:34:56 +01:00
Dominik Prokop d3a321cac1 Merge pull request #16138 from grafana/tooling/storybook-sass-theme
Enable sass theme change in Storybook
2019-03-22 09:27:50 +01:00
Torkel Ödegaard 268dca5b3d Merge pull request #16112 from ryantxu/show-all-columns
show all numeric columns in singlestats/graph2
2019-03-22 09:19:18 +01:00
Torkel Ödegaard ded73c9733 Merge pull request #16140 from markelog/license
Small license correction
2019-03-22 08:33:31 +01:00
ryan 78a9243721 remove logging 2019-03-22 00:21:04 -07:00
ryan 658f419cab add stat picker to single stat 2019-03-22 00:14:50 -07:00
ryan 8e6279cbca removed option to not check strings 2019-03-21 22:25:02 -07:00
ryan 3f44445dd6 drop one level of nesting 2019-03-21 21:58:10 -07:00
ryan 7498de044c cleanup and guess all columns 2019-03-21 21:52:58 -07:00
Oleg Gaidarenko 7316bdc99f Small license correction
It seems the license should be applied little bit differently -
https://github.com/search?l=&o=desc&q=license%3Aapache-2.0&s=stars&type=Repositories.

Also see https://apache.org/licenses/LICENSE-2.0#apply
2019-03-21 16:36:24 +01:00
Mitsuhiro Tanda 4d8eb76dca update cloudwatch metrics/dimensions list 2019-03-22 00:08:17 +09:00
Dominik Prokop 35f6039da7 Enable sass theme change in Storybook 2019-03-21 16:06:55 +01:00
ryan f8094a6e09 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (107 commits)
  another change that didn't come with earlier commit
  change that didn't come with in last commit
  reversed dashboard-padding
  Update CloudWatch metrics/dimension list (#16102)
  brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific
  fix(prometheus): Change aligment of range queries (#16110)
  Minor refactoring of testdata query order PR #16122
  cleaner version
  maintain query order
  Update PLUGIN_DEV.md
  Merge with master, and updated logo and name
  update table data model
  fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488
  Correct table names of sql storage for remotecache
  more fixes to snapshot
  more fixes to snapshot
  Fixed gofmt issue in PR #16093
  removed empty space in snapshot
  fix: Update snapshot related to new jest version
  fixed snapshot for test
  ...
2019-03-21 08:01:11 -07:00
ryan 50ebc768c8 Merge remote-tracking branch 'grafana/master' into show-all-columns
* grafana/master: (56 commits)
  another change that didn't come with earlier commit
  change that didn't come with in last commit
  reversed dashboard-padding
  Update CloudWatch metrics/dimension list (#16102)
  brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific
  fix(prometheus): Change aligment of range queries (#16110)
  Minor refactoring of testdata query order PR #16122
  cleaner version
  maintain query order
  Update PLUGIN_DEV.md
  Merge with master, and updated logo and name
  more fixes to snapshot
  more fixes to snapshot
  removed empty space in snapshot
  fixed snapshot for test
  removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard
  Tooltip: show percent instead of value
  Right tooltip position
  Add "No data points" message
  Improve tooltip look
  ...
2019-03-21 07:59:58 -07:00
Torkel Ödegaard f2e1bfcde7 Merge pull request #16099 from grafana/dashboard-variables-and-some-more
Removed dashboard variables + minor things
2019-03-21 15:56:32 +01:00
ijin08 85bfb1dba8 replaced rems with pixels or variables 2019-03-21 15:44:14 +01:00
Peter Holmberg 6e05b9f41c adding test 2019-03-21 14:05:45 +01:00
Peter Holmberg 528f085c96 updating usages in singlestat 2019-03-21 14:03:53 +01:00
Peter Holmberg 205a5baa56 Sorting imports 2019-03-21 13:49:12 +01:00
Peter Holmberg c0ab877966 adding function 2019-03-21 13:45:50 +01:00
Sean Lafferty 50c5854430 Use grafana's logger implementation 2019-03-21 08:13:03 -04:00
ijin08 eaaa1681e2 another change that didn't come with earlier commit 2019-03-21 12:29:13 +01:00
ijin08 45e361ef13 change that didn't come with in last commit 2019-03-21 12:26:35 +01:00
ijin08 8d03db2474 reversed dashboard-padding 2019-03-21 12:15:13 +01:00
Mitsuhiro Tanda 56251ca546 Update CloudWatch metrics/dimension list (#16102)
update cloudWatch metrics/dimension list
2019-03-21 11:13:06 +01:00
ijin08 29e68ba1fc brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific 2019-03-21 11:10:44 +01:00
ijin08 2db02bd240 replaced rem with pixels or variables 2019-03-21 10:43:06 +01:00
David 9008fcc790 fix(prometheus): Change aligment of range queries (#16110)
- future alignment cause issues with rate charts and the display of last
values
- this change modifies the alignment to use the last available aligned
end date and no longer possibly requests data from the future
2019-03-21 10:25:20 +01:00
Mitsuhiro Tanda 38457fabc1 fix, assign by event.time 2019-03-21 16:39:37 +09:00
Torkel Ödegaard 8847da0d69 Merge pull request #16121 from joshuawoodward/patch-1
Update PLUGIN_DEV.md
2019-03-21 08:36:52 +01:00
Torkel Ödegaard 6b6029d82d Merge pull request #16117 from grafana/very-alpha-pie-chart
Very alpha pie chart
2019-03-21 08:36:25 +01:00
Torkel Ödegaard 85b0df551c Minor refactoring of testdata query order PR #16122 2019-03-21 08:01:44 +01:00
Mitsuhiro Tanda e868475c5b simplify 2019-03-21 15:48:22 +09:00
Mitsuhiro Tanda e1a2b258af deduplicate same value annotation 2019-03-21 10:26:46 +09:00
ryan c91e5a2db4 cleaner version 2019-03-20 14:50:46 -07:00
ryan 80d6475224 maintain query order 2019-03-20 12:50:58 -07:00
Sean Lafferty b3461c9806 Remove sleeps in test code by overriding time.Now() 2019-03-20 15:34:31 -04:00
Joshua Woodward 742a76e4c5 Update PLUGIN_DEV.md 2019-03-20 12:24:54 -07:00
Sean Lafferty 3b9b6c571a Abstract encrypt/encode and decode/decrypt into their own functions 2019-03-20 15:18:22 -04:00
Sean Lafferty b696492891 Rename dispatched commands to make them easy to grok 2019-03-20 14:32:41 -04:00
ryan 0558b17b9e show all colums in graph 2019-03-20 11:27:56 -07:00
Sean Lafferty be6e76ee35 Use structured logging instead of printf 2019-03-20 14:25:26 -04:00
Sean Lafferty dba2df19e8 Make all http auth setting labels the same width 2019-03-20 14:19:29 -04:00
Torkel Ödegaard e4e553b5a2 Merge with master, and updated logo and name 2019-03-20 19:17:23 +01:00
ryan e7a6041d22 Merge remote-tracking branch 'grafana/master' into show-all-columns
* grafana/master:
  flot pairs
2019-03-20 11:16:03 -07:00
Torkel Ödegaard ac82fc03d9 Merge branch 'piechart-react' of https://github.com/CorpGlory/grafana into CorpGlory-piechart-react 2019-03-20 19:01:37 +01:00
Magnus Berglund e6623de6b2 Rewrote creation of images tag 2019-03-20 18:59:13 +01:00
Torkel Ödegaard 93677f16d3 Merge pull request #16095 from ryantxu/flot-pairs
calculate flot pairs
2019-03-20 18:52:10 +01:00
Magnus Berglund 0511095303 Added missing commas 2019-03-20 18:42:48 +01:00
ryan 0cfa929d4c incorporate torkels feedback 2019-03-20 10:32:34 -07:00
Magnus Berglund 0de77598d7 Don't include non-existing image in MS Teams alert
If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.

Closes #16082
2019-03-20 18:23:36 +01:00
Torkel Ödegaard 3884ac855e Merge pull request #16105 from grafana/graphite-fix-0-arg
Graphite: fixed nonNegativeDerivative argument hidden if 0
2019-03-20 18:18:47 +01:00
Torkel Ödegaard bb14be9148 Merge pull request #16115 from ryantxu/column-types
update TableData model
2019-03-20 18:12:10 +01:00
ryan 5947c1f76d cast to column 2019-03-20 09:56:53 -07:00
ryan a9cc8a8992 update table data model 2019-03-20 09:45:19 -07:00
ryan c4a503dbc5 show all columns in singlestats 2019-03-20 09:07:11 -07:00
ryan 2c8e1cbdb1 merge with master 2019-03-20 08:16:34 -07:00
Torkel Ödegaard 78d93315a9 fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488 2019-03-20 15:35:34 +01:00
Oleg Gaidarenko 30f0c35006 Merge pull request #16104 from markelog/remotecache-small-fix
Correct table names of sql storage for remotecache
2019-03-20 14:08:02 +01:00
Oleg Gaidarenko c5bc723a6e Correct table names of sql storage for remotecache 2019-03-20 13:24:56 +01:00
ijin08 6471f6feb0 more fixes to snapshot 2019-03-20 11:37:45 +01:00
ijin08 67e802c595 more fixes to snapshot 2019-03-20 11:13:19 +01:00
Torkel Ödegaard e5d84f8c74 Merge pull request #15967 from grafana/bump-webpack
Bump npm packages related to the dev process
2019-03-20 11:00:45 +01:00
Torkel Ödegaard 665f7acade Merge branch 'master' of github.com:grafana/grafana 2019-03-20 10:59:41 +01:00
Torkel Ödegaard 1085055d61 Merge PR https://github.com/grafana/grafana/pull/16093 2019-03-20 10:59:05 +01:00
Torkel Ödegaard d11695b8b5 Fixed gofmt issue in PR #16093 2019-03-20 10:58:20 +01:00
Torkel Ödegaard ab5848ca14 Merge pull request #16096 from grafana/fix/15691-refresh-issue-playlists
Fixing issue with refresh playlists
2019-03-20 10:52:16 +01:00
Torkel Ödegaard fd4ee6b032 Merge branch 'patch-1' of https://github.com/sairam0903/grafana into sairam0903-patch-1 2019-03-20 10:50:11 +01:00
ijin08 7fcb9777c0 removed empty space in snapshot 2019-03-20 10:49:34 +01:00
Johannes Schill 13f70be5f0 fix: Update snapshot related to new jest version 2019-03-20 10:36:33 +01:00
ijin08 2a53be050c fixed snapshot for test 2019-03-20 10:29:28 +01:00
Torkel Ödegaard 0091b86e9c Merge pull request #16078 from grafana/secret-input-field-component
Secret input field component
2019-03-20 10:15:33 +01:00
Johannes Schill e0e6dd8fb0 Regenerate lockfile due to the amount of merge conflicts. 2019-03-20 09:50:53 +01:00
ijin08 9e57195b1d removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard 2019-03-20 09:48:19 +01:00
Johannes Schill 7dec4a9f2d Merge branch 'master' into bump-webpack
# Conflicts:
#	package.json
#	yarn.lock
2019-03-20 09:43:33 +01:00
Andrej Ocenas a26dc64ebe Remove commented code 2019-03-20 09:20:30 +01:00
Peter Holmberg 81afd68752 Merge branch 'master' into fix/15691-refresh-issue-playlists 2019-03-20 09:17:57 +01:00
Torkel Ödegaard abd8948478 Merge pull request #15864 from ryantxu/all-data-as-table
Use TableData for all data in react
2019-03-20 09:15:06 +01:00
Torkel Ödegaard 0a2d69c794 Merge pull request #16089 from grafana/no-implicit-any-fixes-p4
Fixed no implicit any for form dropdown & panel model
2019-03-20 07:01:14 +01:00
Torkel Ödegaard b203868a9f Merge pull request #16034 from ryantxu/table-cell-measure
Don't measure cell widths in react table
2019-03-20 06:59:19 +01:00
ryan 2f8dd898b0 flot pairs 2019-03-19 22:22:38 -07:00
ryan 7e56514c5a add more functions and tests 2019-03-19 21:19:58 -07:00
ryan 37bb5ef790 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (101 commits)
  refactor: merged types and updated references
  Remove leftover from first iteration
  Snapshot update
  fix: ts issue on SelectOption test
  chore: Bump react and react-dom to 16.8.4
  Update latest.json
  Update templating.md
  Update CHANGELOG.md
  chore: cleaning up noimplicit anys in search_srv and tests progress: #14714
  Fix threshold editor color picker not working for custom colors
  Updated threshold editor test
  Re-render gauge / singlestat panels when changing options
  fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel
  teams: explains the external property of a team membership.
  fix: fixed snapshots and permission select not beeing able to click
  fix: new team link goes nowhere for viewers
  teams: refactor so that you can only delete teams if you are team admin
  permissions: removes global access to bus from MakeUserAdmin.
  teams: local access to bus, moving away from dep on global.
  teams: better names for api permissions.
  ...
2019-03-19 20:30:11 -07:00
Sai Ram Gupta 6929593eb6 Update org_user.go
Add check for, if current role is ROLE_VIEWER, return true if the role I'm checking for is ROLE_VIEWER. Fixes #16092
2019-03-19 11:31:55 -07:00
Torkel Ödegaard f69f0c2c31 Merge pull request #16079 from grafana/fix/threshold-custom-color
Fix threshold editor color picker not working for custom colors
2019-03-19 18:39:17 +01:00
Torkel Ödegaard 4f134ea4b8 Merge pull request #16080 from grafana/hugoh/no-implicit-any
Cleaning up no implicit anys in search_srv and tests
2019-03-19 18:26:28 +01:00
Torkel Ödegaard 42c87141a5 Minor progress on fixing no-implicit any issues 2019-03-19 18:24:47 +01:00
Hugo Häggmark d845aacbdc refactor: merged types and updated references 2019-03-19 17:44:58 +01:00
ryan 08d6540cbb merge master 2019-03-19 09:26:15 -07:00
Torkel Ödegaard b8be6aa3b8 Merge pull request #16084 from yalhyane/patch-1
Fixing docs typo in templating.md
2019-03-19 17:06:10 +01:00
Torkel Ödegaard a1a60ceae0 Merge pull request #16087 from grafana/chore/bump-react
chore: Bump react and react-dom to 16.8.4
2019-03-19 17:00:11 +01:00
Dominik Prokop 9205b82f19 Remove leftover from first iteration 2019-03-19 16:38:14 +01:00
Peter Holmberg 5adb923ace Only keep certain query params when going to next playlist 2019-03-19 16:34:33 +01:00
Dominik Prokop 12d452ce92 Snapshot update 2019-03-19 16:31:26 +01:00
Dominik Prokop 1178115d50 fix: ts issue on SelectOption test 2019-03-19 16:15:19 +01:00
Dominik Prokop 512f2dd024 chore: Bump react and react-dom to 16.8.4 2019-03-19 16:11:47 +01:00
Hugo Häggmark 124bedbf24 Update latest.json 2019-03-19 15:44:10 +01:00
yalhyane 9a4a8b0f85 Update templating.md
fix a typo in the example of `percentencode` option
2019-03-19 14:39:26 +00:00
Hugo Häggmark 40978ee08a Update CHANGELOG.md 2019-03-19 15:10:00 +01:00
Leonard Gram f2b06a89f2 Merge pull request #15977 from grafana/admin-on-create-poc
Editors becomes admin when creating dashboards, folders & teams
2019-03-19 15:02:52 +01:00
Torkel Ödegaard 531176b559 Merge pull request #16077 from grafana/gauge-change-options-render
Re-render gauge / singlestat panels when changing options
2019-03-19 15:01:26 +01:00
Torkel Ödegaard c19a47d34f Merge pull request #16008 from grafana/bar-gauge-refactoring
Refactoring the bar gauge and the orientation modes
2019-03-19 15:00:30 +01:00
Hugo Häggmark c1d585b156 chore: cleaning up noimplicit anys in search_srv and tests
progress: #14714
2019-03-19 14:48:35 +01:00
Dominik Prokop 97a000c319 Fix threshold editor color picker not working for custom colors
When user selected Custom as an option for a threshold colors, the Custom color picker did not work. The problem was caused by threshold model not including the default colors for fill and line colors when custom was selected. Now, when changing the type to custom, the default valoues are set.
2019-03-19 14:47:48 +01:00
Andrej Ocenas aa14d7528c Updated comments 2019-03-19 14:16:01 +01:00
Leonard Gram 95f7a91328 Merge pull request #16069 from xlson/ci-deploy-speedup
build: crcmod speedups rsync to gcp for deploy.
2019-03-19 14:13:15 +01:00
Torkel Ödegaard 2ca5149c67 Updated threshold editor test 2019-03-19 14:12:47 +01:00
Leonard Gram 2ca8d17874 Merge pull request #16071 from xlson/include-build-container
build: migrates the build container into the main repo.
2019-03-19 14:10:02 +01:00
Torkel Ödegaard d597271844 Re-render gauge / singlestat panels when changing options 2019-03-19 14:07:48 +01:00
Hugo Häggmark 53322a51e2 fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel 2019-03-19 14:01:22 +01:00
Leonard Gram 978c20a604 teams: explains the external property of a team membership. 2019-03-19 14:01:22 +01:00
Hugo Häggmark e23e6a8bdc fix: fixed snapshots and permission select not beeing able to click 2019-03-19 14:01:21 +01:00
Hugo Häggmark b71c9803a9 fix: new team link goes nowhere for viewers 2019-03-19 14:01:21 +01:00
Hugo Häggmark 53c74fa2f5 teams: refactor so that you can only delete teams if you are team admin 2019-03-19 14:01:21 +01:00
Leonard Gram a615b78f8a permissions: removes global access to bus from MakeUserAdmin. 2019-03-19 14:01:20 +01:00
Leonard Gram adf0390b2c teams: local access to bus, moving away from dep on global. 2019-03-19 14:01:20 +01:00
Leonard Gram 6589a4e55f teams: better names for api permissions. 2019-03-19 14:01:20 +01:00
Leonard Gram 9f33f00343 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram 9f8e43916d permissions: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram b796027bc6 teams: refactor. 2019-03-19 14:01:19 +01:00
Hugo Häggmark 13ed10495a teams: hide tabs settings and groupsync for non team admins 2019-03-19 14:01:18 +01:00
Leonard Gram d1481cac50 teams: refactored db code. 2019-03-19 14:01:18 +01:00
Hugo Häggmark 8c34f595f0 teams: disable new team button if user is viewer 2019-03-19 14:01:18 +01:00
Hugo Häggmark e3fc61b326 refactor: moved test from TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark 178d637b4e refactor: splitted TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark 6a63725df0 teams: comment explaining input validation
Co-Authored-By: xlson <leo@xlson.com>
2019-03-19 14:01:17 +01:00
Leonard Gram 3f57a81c47 teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram ccfd6789ca teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram fc0461134f dashboards: simplified code. 2019-03-19 14:01:15 +01:00
Hugo Häggmark b82b94a247 teams: disable buttons for team members 2019-03-19 14:01:15 +01:00
Hugo Häggmark b60e71c28b teams: moved logic for searchteams to backend 2019-03-19 14:01:15 +01:00
Hugo Häggmark 782b5b6a3a teams: viewers and editors can view teams 2019-03-19 14:01:14 +01:00
Leonard Gram c420af16b1 teams: editor/viewer team admin cant remove the last admin. 2019-03-19 14:01:14 +01:00
Hugo Häggmark 246e128048 teams: changed permission to permission type instead of int 2019-03-19 14:01:14 +01:00
Hugo Häggmark c826f39a8b teams: defaulting invalid permission level to member permission level 2019-03-19 14:01:13 +01:00
Leonard Gram c823ad5de7 team: uses PermissionType instead of int64 for permissions. 2019-03-19 14:01:13 +01:00
Leonard Gram 21d3d27452 teams: editors can't remove the last admin from a team. 2019-03-19 14:01:13 +01:00
Leonard Gram 8593668ab2 teams: tests use the new message for modifying team members. 2019-03-19 14:01:12 +01:00
Leonard Gram b783fa7039 team: renames teams.CanUpdate teamguardian.CanAdmin 2019-03-19 14:01:12 +01:00
Hugo Häggmark 96aa4ae19f teams: remov permission select for non admin users 2019-03-19 14:01:12 +01:00
Hugo Häggmark b9cf09a296 docs: First take on describing feature toggle 2019-03-19 14:01:11 +01:00
Hugo Häggmark a90b3e331e config: updated feature toggle name 2019-03-19 13:59:39 +01:00
Leonard Gram a6a3d698da teams: cleanup. 2019-03-19 13:57:30 +01:00
Leonard Gram 0b209de5d1 dashboard: only admin permission added to dashboard in folder. 2019-03-19 13:57:30 +01:00
Leonard Gram d593ffe3c1 dashboards: better error handling 2019-03-19 13:57:30 +01:00
Leonard Gram 89d4db8eb6 teams: team listing shows only your teams (editors). 2019-03-19 13:57:29 +01:00
Leonard Gram 1f949e58e1 teams: teams guard on all teams update methods. 2019-03-19 13:57:29 +01:00
Leonard Gram 23231e6d51 teams: added delete team guard 2019-03-19 13:57:29 +01:00
Leonard Gram 8e7a8282c1 teams: removed feature toggle as it is already in middleware 2019-03-19 13:57:28 +01:00
Leonard Gram d668550aa2 teams: added feature toggle and refactor tests 2019-03-19 13:57:28 +01:00
Leonard Gram 0d61f89577 teams: cleanup. 2019-03-19 13:57:28 +01:00
Leonard Gram 3be1d71f1f teams: test refactorings. 2019-03-19 13:57:27 +01:00
Leonard Gram 319879cfa8 teams: bugfix, user pointer. 2019-03-19 13:57:27 +01:00
Leonard Gram 90e9fda90c teams: start of team update guardian for editors 2019-03-19 13:57:26 +01:00
Hugo Häggmark 5adde259d3 teams: team update test 2019-03-19 13:57:26 +01:00
Hugo Häggmark 3c46b786d2 teams: change back to permissionlevel for Member to 0 2019-03-19 13:57:26 +01:00
Hugo Häggmark 1315a67022 teams: make sure we use TeamPermissionLevel enum 2019-03-19 13:57:25 +01:00
Hugo Häggmark 3c74ac3044 teams: update only the selected user 2019-03-19 13:57:25 +01:00
Hugo Häggmark 074ebf0f48 teams: only write error message if error 2019-03-19 13:57:25 +01:00
Hugo Häggmark eea2dcc605 teams: enabled so that user can update permission for team members 2019-03-19 13:57:24 +01:00
Hugo Häggmark 467b7a40d8 teams: feature toggle component 2019-03-19 13:57:24 +01:00
Leonard Gram aedc478208 teams: test for update team member. 2019-03-19 13:57:24 +01:00
Leonard Gram 2a88052c14 teams: can update team members permission. 2019-03-19 13:57:23 +01:00
Hugo Häggmark 7888457aae teams: basic ui for permission in team members view 2019-03-19 13:57:23 +01:00
Leonard Gram af4994ba16 teams: editor added as admin for created teams. 2019-03-19 13:57:22 +01:00
Leonard Gram 22e098b830 teams: editors can work with teams. 2019-03-19 13:57:22 +01:00
Hugo Häggmark efbd93f824 teams: show teams and plugins for editors that can own 2019-03-19 13:57:22 +01:00
Hugo Häggmark 124fb743e8 teams: make test cases pass again 2019-03-19 13:57:21 +01:00
Leonard Gram da3dcd1918 folder: uses service to make user admin of created folder. 2019-03-19 13:57:21 +01:00
Leonard Gram c8c004095c permissions: broken out func for making creator admin. 2019-03-19 13:57:21 +01:00
Leonard Gram e174f7c20b folders: admin for created folders 2019-03-19 13:57:20 +01:00
Leonard Gram e294252e92 dashboards: user automatically becomes admin for created dashboards 2019-03-19 13:57:20 +01:00
Torkel Ödegaard b8c355514d Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:43:49 +01:00
Torkel Ödegaard abbb7b81c7 fix(ci): frontend tests was accidentially commented out 2019-03-19 13:42:40 +01:00
Hugo Häggmark 9f6b793563 Update CHANGELOG.md 2019-03-19 13:41:47 +01:00
Andrej Ocenas 150b97692d Use SecretFormField in MSSql and Postgres datasources 2019-03-19 13:40:18 +01:00
Andrej Ocenas d8167ffb88 Add SecretFormField component 2019-03-19 13:40:17 +01:00
Andrej Ocenas 0d84a3fbe2 Add possibility to pass custom input component to FormField 2019-03-19 13:40:17 +01:00
Andrej Ocenas 8f0d92ef85 Allow angular react bridge to use kebab case attribute names 2019-03-19 13:40:16 +01:00
Torkel Ödegaard 6be416dd93 Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:40:02 +01:00
Torkel Ödegaard 8af1326a95 Merge pull request #16075 from grafana/fix-thresholds-tests
Fix for Thresholds tests
2019-03-19 13:38:47 +01:00
Peter Holmberg d075af2b67 adding story and fixing tests 2019-03-19 13:14:32 +01:00
Leonard Gram 4dceb60d20 build: migrates the build container into the main repo. 2019-03-19 11:34:01 +01:00
Leonard Gram 4152e5c16c build: updated deploy container with crcmod. 2019-03-19 10:57:17 +01:00
Leonard Gram 39e75d75b4 build: crcmod speedups rsync to gcp for deploy. 2019-03-19 10:48:41 +01:00
Carl Bergquist d9db457b87 Merge pull request #16033 from bergquist/backend_codestyle
Adds backend code style guide
2019-03-19 08:16:36 +01:00
Leonard Gram 6673915f2e Update style_guides/backend.md
Co-Authored-By: bergquist <carl@grafana.com>
2019-03-19 08:16:19 +01:00
ryan 9b4d2a5ffa remove the error collector 2019-03-18 15:06:57 -07:00
Torkel Ödegaard 25cd196c09 Merge pull request #16006 from grafana/fix-explore-refId
Explore: Query row using character refId instead of number
2019-03-18 22:59:47 +01:00
Torkel Ödegaard 32d80f2da8 Merge pull request #16045 from grafana/hugoh/no-implicit-any
Cleaning up implicit anys in DashboardExporter and tests
2019-03-18 22:50:23 +01:00
Torkel Ödegaard 89bf94b07c Merge pull request #16054 from grafana/input-to-grafanaui2
Input to grafanaui2
2019-03-18 22:49:40 +01:00
Torkel Ödegaard 5617db36b2 Merge pull request #16014 from alexanderzobnin/fix-15993
Panels: fix loading panels with non-array targets
2019-03-18 22:34:24 +01:00
ryan ed1b515f82 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master:
  docs: renamed file and added redux framework file
  docs: moved examples to frontend.md
  docs: intial draft for frontend review doc
  Use ora#fail instead of console.log
  Remove .only function
  Add more patterns to no-only-test task
2019-03-18 14:19:50 -07:00
Daniel Lee 8859d16a41 Merge pull request #16052 from markelog/ora-fail
Use ora#fail instead of console.log
2019-03-18 17:35:54 +01:00
Andrej Ocenas cdced6e43f Merge pull request #16047 from grafana/grunt-no-only-tests-add-patterns
Add patterns to no-only-tests grunt task
2019-03-18 17:14:50 +01:00
Peter Holmberg 384e11fd68 Copied from new timepicker and unified component branch 2019-03-18 15:41:46 +01:00
Hugo Häggmark ed1b001904 docs: renamed file and added redux framework file 2019-03-18 06:39:34 -07:00
Hugo Häggmark f251345b68 docs: moved examples to frontend.md 2019-03-18 06:39:34 -07:00
Hugo Häggmark f3b9ce317e docs: intial draft for frontend review doc 2019-03-18 06:39:34 -07:00
Oleg Gaidarenko 2b9cf1132f Use ora#fail instead of console.log
Since with ora#fail you can stderr it instead of using the stdout,
and it's a bit nicer since it will show that cross sign :)
2019-03-18 13:45:58 +01:00
Peter Holmberg be7a5dab69 reorder imports 2019-03-18 11:23:40 +01:00
Peter Holmberg cb9bda810f test 2019-03-18 11:21:40 +01:00
Peter Holmberg 39728c885b rename to char 2019-03-18 11:17:58 +01:00
Peter Holmberg 515fb5903e sorting imports 2019-03-18 10:44:00 +01:00
Peter Holmberg c0eb140297 moving 2019-03-18 10:41:28 +01:00
Andrej Ocenas dcc5373e77 Remove .only function 2019-03-18 10:40:04 +01:00
Andrej Ocenas 854644f46c Add more patterns to no-only-test task 2019-03-18 10:39:14 +01:00
Hugo Häggmark 0eb2ca3ffd chore: Cleaning up implicit anys in DashboardExporter and tests
progress: #14714
2019-03-18 07:42:43 +01:00
ryan c210417736 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
2019-03-17 18:10:35 -07:00
ryan a0fa5698e0 rename reducer to statsCalculator 2019-03-17 18:02:09 -07:00
ryan 2969507784 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (75 commits)
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
  get values from base options
  use singlestat base where appropriate
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  no inheratance
  improve single stat display
  revert most options sharing
  add migration tests
  ...
2019-03-17 16:48:54 -07:00
Torkel Ödegaard 1303a66725 Great progress on bar gauge look 2019-03-17 13:59:26 +01:00
Torkel Ödegaard d1e48a07b2 Merge pull request #16031 from ryantxu/random-walk-start-at
add startValue to random_walk testdata scenario and random_walk_table
2019-03-17 13:18:40 +01:00
Torkel Ödegaard 34b6405fd9 Merge pull request #16036 from steven-sheehy/log-stats-overflow
Explore: Fix log stats with long labels
2019-03-17 13:16:43 +01:00
Steven Sheehy ec34099ea7 Explore: Fix log stats for long labels
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-16 00:55:10 -05:00
ryan a6132d7648 merge singlestat refactor 2019-03-15 15:37:56 -07:00
Torkel Ödegaard bfa54d2e26 Merge pull request #15925 from ryantxu/reusable-formatting-options
make value processing/formatting more reusable
2019-03-15 22:13:46 +01:00
ryan 9bcc9b062c calculate the column width 2019-03-15 13:52:32 -07:00
ryan e6cba97b45 disable react table cell measure 2019-03-15 13:31:40 -07:00
ryan bd811b4a95 dont test exists in the test... it will fail if not found 2019-03-15 12:36:55 -07:00
ryan 24ead3a4a4 add random_walk_table scenario 2019-03-15 12:33:45 -07:00
bergquist 98911e0708 adds backend code style guide 2019-03-15 20:19:24 +01:00
ryan 2b5ac6bafa add test file 2019-03-15 11:07:20 -07:00
ryan e787176bca add startAt to random walk scenario 2019-03-15 11:02:41 -07:00
ryan ff3c25ad79 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master: (57 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  makes variables template prettier complient
  white space formating
  changelog: adds note about #15744
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  ...
2019-03-15 09:19:01 -07:00
ryan 0bb772aba7 get values from base options 2019-03-15 09:03:47 -07:00
ryan b1b5e8d74c use singlestat base where appropriate 2019-03-15 08:38:29 -07:00
ryan 77b78e36e5 Merge remote-tracking branch 'grafana/master' into reusable-formatting-options
* grafana/master: (44 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  use `Get` instead of `Find`
  avoid exposing cache client directly
  add docs about remote cache settings
  ...
2019-03-15 08:23:55 -07:00
Steven Sheehy fff6e0a522 feature(explore/table): Add tooltips to explore table (#16007)
Longer labels are now viewable as a tooltip in the Explore table

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-15 14:11:40 +01:00
Carl Bergquist 011e8c4a35 Merge pull request #16022 from grafana/connection-string-log-fix-simple
Only log connection string in dev environment
2019-03-15 14:03:01 +01:00
Carl Bergquist b1b0082e36 Merge pull request #16020 from JacobEriksson/patch-1
Update index.md
2019-03-15 14:00:23 +01:00
Andrej Ocenas 38f82cfb0e Update changelog 2019-03-15 13:34:39 +01:00
Torkel Ödegaard 91ff146d7d Bar gauge gradient mode 2019-03-15 13:34:38 +01:00
Torkel Ödegaard 714e03c162 Bar gauge auto lcd cell count 2019-03-15 12:45:37 +01:00
Andrej Ocenas 09b9b595b2 Add check for Env before log 2019-03-15 11:53:30 +01:00
JacobEriksson e2fd85854c Update index.md
Added information about Amazon Timestream and Oracle Database
2019-03-15 11:07:22 +01:00
Hugo Häggmark 96af051cb2 chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts
progress: #14714
2019-03-15 01:59:16 -07:00
Hugo Häggmark aa4b593dfa chore: Cleaning up implicit anys in app.ts
progress: #14714
2019-03-15 01:59:16 -07:00
Alexander Zobnin c028d410ec panels: fix loading panels with non-array targets (add tests) 2019-03-15 11:30:41 +03:00
bergquist 1db7913a1c changelog: adds note about closing #15836 2019-03-15 09:25:58 +01:00
Peter Holmberg 6ca1ae309a set correct return type 2019-03-15 08:52:25 +01:00
Alexander Zobnin fe798239b2 panels: fix loading panels with non-array targets (refactor) 2019-03-15 10:31:58 +03:00
Torkel Ödegaard 707d188428 Bar gauge styling tweaks 2019-03-15 08:29:11 +01:00
Alexander Zobnin e3b3b35dca panels: fix loading panels with non-array targets 2019-03-15 10:14:56 +03:00
bergquist 1ddf6dafb6 changelog: adds note about closing #6359 and #15931 2019-03-15 07:32:33 +01:00
Torkel Ödegaard 6a87c9ec7f Merge pull request #16010 from ryantxu/partial-change-hook
use Partial<TOptions> with new PanelTypeChangedHooks
2019-03-15 06:58:05 +01:00
ryan 75710d0f2b add partial 2019-03-14 14:58:46 -07:00
ryan 1fa07a8254 no inheratance 2019-03-14 14:47:01 -07:00
ryan 8be56f8a0e improve single stat display 2019-03-14 13:31:50 -07:00
ryan 985f057ab3 revert most options sharing 2019-03-14 13:20:24 -07:00
Torkel Ödegaard 09eddd1676 Refactoring the bar gauge and the orientation modes 2019-03-14 18:48:12 +01:00
Sean Lafferty 3f9a19dcd5 Merge branch 'master' into 12556-oauth-pass-thru 2019-03-14 13:18:00 -04:00
ryan 8299c95459 add migration tests 2019-03-14 09:51:40 -07:00
ryan ccf66154bb add migration tests 2019-03-14 09:50:59 -07:00
Peter Holmberg 52dcb9bf00 renaming function 2019-03-14 17:39:56 +01:00
Andrej Ocenas 8221c4273f Merge pull request #15998 from grafana/add-grafana-user-proxy-header
Add custom header with grafana user when using proxy
2019-03-14 17:29:06 +01:00
Peter Holmberg cf55d68894 using refId from panel model 2019-03-14 17:20:33 +01:00
Carl Bergquist 23852b59c9 Merge pull request #15839 from grafana/15836_revoke_auth_tokens
Support list and revoke of user auth tokens in HTTP API
2019-03-14 17:12:49 +01:00
corpglory-dev dbec66b3d6 Tooltip: show percent instead of value 2019-03-14 18:40:44 +03:00
Andrej Ocenas 697a87b7b2 Add check so that header is not sent for anonymous users 2019-03-14 16:33:21 +01:00
Andrej Ocenas 6587a967eb Update config docs 2019-03-14 16:33:20 +01:00
Andrej Ocenas bbdc1c0e64 Add custom header with grafana user and a config switch for it 2019-03-14 16:33:19 +01:00
bergquist 191a7e4b8d changelog: adds note about closing #10816 2019-03-14 16:19:12 +01:00
corpglory-dev 4ba5217a08 Right tooltip position 2019-03-14 18:18:40 +03:00
Carl Bergquist 291ffcb75b Merge pull request #15457 from bergquist/distributed_cache
Distributed cache
2019-03-14 16:16:39 +01:00
corpglory-dev d36b07bd68 Add "No data points" message 2019-03-14 18:09:24 +03:00
bergquist 6d42d43b22 use constants for cache type 2019-03-14 15:48:20 +01:00
bergquist 5f059038c6 makes variables template prettier complient 2019-03-14 13:52:36 +01:00
Sean Lafferty f3c52710df Make recently used auth_module test more robust by adding another 'log in' 2019-03-14 08:40:19 -04:00
Torkel Ödegaard 12219a1d7e Merge pull request #15957 from ryantxu/panel-options-init
improve the new PreservePanelOptionsHandler
2019-03-14 13:05:09 +01:00
bergquist f059c25f95 white space formating 2019-03-14 10:59:13 +01:00
bergquist 7b692c1cfd changelog: adds note about #15744 2019-03-14 10:10:58 +01:00
Carl Bergquist 11d9122cf5 Merge pull request #15916 from zhulongcheng/victorops-noti
Add more info to victorOps alert notifications
2019-03-14 10:02:44 +01:00
bergquist 0a86a1d7b6 updates old distcache names 2019-03-14 09:23:35 +01:00
bergquist c001cfe1d9 dont allow inifinite expiration 2019-03-14 09:22:03 +01:00
Johannes Schill df453d15de chore: Upgrade all babel related packages that is lagging behind 2019-03-14 09:01:27 +01:00
bergquist 5186273731 return error if cache type is invalid 2019-03-14 08:57:38 +01:00
zhulongcheng 755f60358b Add more info to victorOps alert notifications 2019-03-14 15:47:11 +08:00
Johannes Schill 8a2865aedf fix: papaparse must have gone missing during rebase 2019-03-14 08:36:56 +01:00
Johannes Schill 8dee1a27bf chore: Bump jest to 24 2019-03-14 08:28:15 +01:00
Johannes Schill d6a74a5c90 fix: describe() should not be async 2019-03-14 08:26:01 +01:00
Johannes Schill be3f9fcbfe fix: Use proper syntax for plugin-syntax-dynamic-import 2019-03-14 08:26:00 +01:00
Johannes Schill 1680dbac7d fix: Downgrade ts-node to 8.0.2 due to broken theme generation 2019-03-14 08:26:00 +01:00
Johannes Schill c41db1325b chore: Bump ora 2019-03-14 08:25:59 +01:00
Johannes Schill 522afc6f99 chore: Bump tslint (again) 2019-03-14 08:25:59 +01:00
Johannes Schill 1d2ffe2b4b chore: Bump axios 2019-03-14 08:25:58 +01:00
Johannes Schill b4dd476104 chore: Bump npm 2019-03-14 08:25:57 +01:00
Johannes Schill 5c05afea0a chore: Bump glob 2019-03-14 08:25:57 +01:00
Johannes Schill 95382f9920 fix: Invalid css 2019-03-14 08:25:56 +01:00
Johannes Schill bdce61d02a chore: Bump clean-webpack-plugin, html-webpack-harddisk-plugin, postcss-reporter 2019-03-14 08:25:56 +01:00
Johannes Schill da644a700f chore: Bump file-loader and css optimizer webpack plugin 2019-03-14 08:25:55 +01:00
Johannes Schill 79f6b4f8e6 chore: Bump css-loader and remove minimize option since its removed in css-loader 2019-03-14 08:25:54 +01:00
Johannes Schill e29a7b35f5 chore: Bump npm packages and lock down some versions 2019-03-14 08:25:54 +01:00
Johannes Schill 628b4a43ec chore: Bump mini-css-extract-plugin 2019-03-14 08:25:53 +01:00
Johannes Schill 28fe1dc0c7 chore: Lock down versions of expose-loader and html-loader 2019-03-14 08:25:53 +01:00
Johannes Schill 4964627eea chore: Bump fork-ts-checker-webpack-plugin 2019-03-14 08:25:52 +01:00
Johannes Schill 76eff009d2 chore: Prod builds should not cache 2019-03-14 08:25:51 +01:00
Johannes Schill 8eab2bef33 chore: Replace Uglify with Terser 2019-03-14 08:25:51 +01:00
Johannes Schill 51e01eff0a chore: Bump webpack, webpack-bundle-analyzer, webpack-cli and webpack-dev-server to latest 2019-03-14 08:25:50 +01:00
Carl Bergquist 9ac69fefc6 Merge pull request #15987 from fetzerch/tags
docs: Change type of 'tags' in annotationQuery result example to list
2019-03-14 07:48:38 +01:00
Carl Bergquist 89709e34e4 Merge pull request #15989 from utkarshcmu/fix-#15665
Added cloudwatch metric math docs
2019-03-14 07:47:33 +01:00
ryan c023635780 reuse more gauge settings in bargauge 2019-03-13 22:59:38 -07:00
ryan 4600aac7d5 set the unit on time data 2019-03-13 22:31:54 -07:00
ryan ff2e238662 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master:
  generic repeater
  generic repeater
  explore/logs: Hide empty duplicates column
  fix for firefox checkboxes not appearing properly, added appearance as none
  used regex instead of string replacing
2019-03-13 21:30:51 -07:00
ryan c690598557 add error when not found 2019-03-13 17:16:20 -07:00
utkarshcmu 78e08da2ef Added metric math docs 2019-03-13 15:00:41 -07:00
ryan 734a209535 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  generic repeater
  generic repeater
  explore/logs: Hide empty duplicates column
  fix for firefox checkboxes not appearing properly, added appearance as none
  used regex instead of string replacing
2019-03-13 13:28:49 -07:00
ryan c38000d445 merge 2019-03-13 13:27:08 -07:00
ryan 68f7e046ab check types better 2019-03-13 13:11:49 -07:00
ryan 0c086795e3 check types better 2019-03-13 13:07:01 -07:00
Christian Fetzer 0cd59fdbcc docs: Change type of 'tags' in annotationQuery result example to list
A datasource plugin must return a list of tags in the 'tags' field of
the annotationQuery result. A string 'test' would otherwise result in
4 tags in Grafana: 't','e','s','t'.
2019-03-13 20:48:49 +01:00
ryan 75022ebd63 single hook 2019-03-13 12:46:04 -07:00
Torkel Ödegaard 9c4abc9d0c Merge pull request #15982 from steven-sheehy/hide-duplicate-column
explore/logs: Hide empty duplicates column
2019-03-13 20:38:18 +01:00
Torkel Ödegaard 010b45d75e Merge pull request #15981 from srid12/firefox-checkbox-15854
Fix for firefox checkboxes not appearing properly
2019-03-13 20:36:25 +01:00
Torkel Ödegaard bfc84c0f2b Merge pull request #15980 from srid12/custom-variable-issue-15921
used regex instead of string replacing
2019-03-13 20:34:56 +01:00
Torkel Ödegaard 614b4251de Merge pull request #15985 from ryantxu/generic-viz-repeat
VisRepeater should not care about the value type
2019-03-13 20:33:16 +01:00
Sean Lafferty fcc18d8121 Change import path for social in the tests 2019-03-13 14:55:22 -04:00
Sean Lafferty 8d8119aa98 Change import path for social since it has moved 2019-03-13 14:34:55 -04:00
ryan 6472c2bcd9 generic repeater 2019-03-13 11:30:52 -07:00
Sean Lafferty 8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
ryan 36d67f22e9 generic repeater 2019-03-13 11:24:18 -07:00
ryan 1bc8e7a8d1 merge master, works with bar gauge now 2019-03-13 11:12:11 -07:00
Sean Lafferty de338338bf Remove todo about index on user_id in user_auth because it exists 2019-03-13 13:46:49 -04:00
Sean Lafferty 7e62394d01 Add function in ds_proxy to handle oauthPassThru headers 2019-03-13 13:45:32 -04:00
Sean Lafferty f79dc0a89b Remove auth_module settings from oauthPassThru ui 2019-03-13 13:34:10 -04:00
Sean Lafferty 4324a7f51a Remove auth module from ds_proxy oauth test 2019-03-13 13:28:49 -04:00
Sean Lafferty 3b15e110a5 Get most recent oauth token from db, rather than lookup by auth_module 2019-03-13 13:22:22 -04:00
corpglory-dev 2bd64d2c31 Improve tooltip look 2019-03-13 19:44:18 +03:00
corpglory-dev a550e5388a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-13 19:31:40 +03:00
Steven Sheehy 17184257af explore/logs: Hide empty duplicates column
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-13 11:12:29 -05:00
ryan 011b2cdf09 merge master 2019-03-13 09:10:21 -07:00
sridhar-komati 8acc00aa66 fix for firefox checkboxes not appearing properly, added appearance as none 2019-03-13 21:38:16 +05:30
ryan b4a3aecbbc merge master 2019-03-13 09:03:32 -07:00
ryan a17b1912c2 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (95 commits)
  Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
  Add comments
  Add simple test for the ColorPicker
  Use render props pattern in color picker
  Move ColorPicker trigger to separate component and cleanup css
  Improved error handling when rendering dashboard panels, fixes #15913
  fix return type
  Only send ci metrics to hosted metrics instance
  adding types
  Added back branch guard
  moved delete button from sidebar to general tab and renamed it
  Refactoring the ci metrics a bit more making it easier to re-use
  removed unused and very specific variables, also variables with same value as general variable
  reduce loglevel to debug
  Updated bar gauge snapshot
  added some comments about state of components things
  heatmap: fix for negative values
  move sort to table processing
  onCellClick
  rotate!
  ...
2019-03-13 08:38:25 -07:00
ryan b933c57c62 merge master 2019-03-13 08:36:51 -07:00
Sean Lafferty f17307bb97 Always return most recently used auth_module from GetAuthInfo 2019-03-13 11:29:13 -04:00
sridhar-komati 03d4b61208 used regex instead of string replacing 2019-03-13 20:42:19 +05:30
Torkel Ödegaard 4bbd6ab79c Merge pull request #15975 from grafana/fixed-alert-link-issue
Fixed issue with AlertList panel links resulting in panel not found errors
2019-03-13 15:52:14 +01:00
Torkel Ödegaard 91fc73bf82 Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680 2019-03-13 13:51:22 +01:00
Andrej Ocenas f7a8df6ebd Merge pull request #15926 from grafana/create-color-picker-trigger-component
Create default ColorPickerTrigger component
2019-03-13 12:47:52 +01:00
Andrej Ocenas fc199a35ca Add comments 2019-03-13 12:23:41 +01:00
Andrej Ocenas dfb2dd2500 Add simple test for the ColorPicker 2019-03-13 12:23:40 +01:00
Andrej Ocenas 96285c4f56 Use render props pattern in color picker 2019-03-13 12:23:39 +01:00
Andrej Ocenas 4a2905de97 Move ColorPicker trigger to separate component and cleanup css 2019-03-13 12:23:38 +01:00
Torkel Ödegaard d6bab53d3b Merge pull request #15626 from grafana/davkal/15607-explore-line-colors
Explore: Make sure line graphs get different colors
2019-03-13 12:21:44 +01:00
Torkel Ödegaard d8c2264670 Merge pull request #15970 from grafana/dashboard-rendering-error-handling
Improved error handling when rendering dashboard panels
2019-03-13 12:19:58 +01:00
Torkel Ödegaard 2333cf3fd1 Improved error handling when rendering dashboard panels, fixes #15913 2019-03-13 11:43:16 +01:00
Peter Holmberg 1994b18b5a fix return type 2019-03-13 11:37:33 +01:00
Torkel Ödegaard e31029adaa Merge pull request #14877 from papagian/feature-histogram-min-max
Optionally set histogram x-axis min/max
2019-03-13 11:23:30 +01:00
Torkel Ödegaard 9e7d1f4275 Merge pull request #15466 from grafana/bar-gauge-poc
New Bar Gauge panel
2019-03-13 11:12:33 +01:00
Torkel Ödegaard 7164412d84 Merge pull request #15968 from grafana/move-delete-dashboard
Moved delete button in Dashboard settings
2019-03-13 11:09:41 +01:00
Torkel Ödegaard 6445d6cb64 Merge pull request #15963 from grafana/sass-variable-cleanout
Cleaned out some sass variables
2019-03-13 11:09:18 +01:00
Torkel Ödegaard 78b2978846 Only send ci metrics to hosted metrics instance 2019-03-13 10:55:20 +01:00
Torkel Ödegaard 6f226edcc0 Merge branch 'ci-metrics-take2' 2019-03-13 10:50:34 +01:00
Peter Holmberg 9c33a9410f adding types 2019-03-13 10:50:21 +01:00
Torkel Ödegaard 988cc198d2 Added back branch guard 2019-03-13 10:50:17 +01:00
ijin08 c96b3995e4 moved delete button from sidebar to general tab and renamed it 2019-03-13 10:24:26 +01:00
Torkel Ödegaard 4f6fdd8665 Refactoring the ci metrics a bit more making it easier to re-use 2019-03-13 10:10:46 +01:00
ijin08 e632309ab9 removed unused and very specific variables, also variables with same value as general variable 2019-03-13 09:40:56 +01:00
bergquist f13263eb54 reduce loglevel to debug 2019-03-13 09:01:45 +01:00
Torkel Ödegaard 613e233440 Updated bar gauge snapshot 2019-03-13 08:50:44 +01:00
Torkel Ödegaard aa6a9329c3 Merge pull request #15842 from ryantxu/alpha-react-virtualized-table
Alpha react-virtualized table
2019-03-13 08:42:51 +01:00
Torkel Ödegaard af4de51a9a added some comments about state of components things 2019-03-13 08:39:40 +01:00
Torkel Ödegaard 71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
Torkel Ödegaard 6f683a8e9f Merge pull request #15953 from alexanderzobnin/fix-heatmap-negative-values
Heatmap: fix for negative values
2019-03-13 07:27:23 +01:00
ryan 15c111b39d better comments 2019-03-12 21:30:48 -07:00
ryan 8cca611727 comment cleanup 2019-03-12 21:25:35 -07:00
ryan f5e8734c6b force circleci to try again 2019-03-12 21:11:11 -07:00
ryan 4652138987 format 2019-03-12 21:05:33 -07:00
ryan f165139bae touch 2019-03-12 17:03:21 -07:00
ryan 227d28154b touch 2019-03-12 17:02:44 -07:00
ryan 4e5e548902 merge master 2019-03-12 16:57:30 -07:00
ryan 09ba8cd5d3 make sure the validator is called before setState 2019-03-12 16:35:22 -07:00
ryan 7311b14da1 API to fix/update properties before load 2019-03-12 16:10:14 -07:00
ryan c82a7b9bd5 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (32 commits)
  Fixed more typescript no implicit any issues
  Also push to ci metrics to new shared HM instance
  Fixed type issues introduced by adding angular types
  Typescript noAny fixes, start of a long journey
  Updated code stats collection
  Updated path to new script
  POC on collecting metrics in ci process
  changelog: add notes about heatmap issues #15683 #14019
  added two new variables in default theme for panel padding, replaced panelhorizontalpadding and variables.panelverticalpadding with new variables
  renamed default variables: s -> sm, m -> md, l -> lg
  removed gf-form-margin variable and replaced with space- variables where it was used
  heatmap: able to hide buckets with zero value #12080
  s -> sm, m -> md, l -> lg
  heatmap: fix prometheus buckets sorting, closes #15637
  s -> sm, m -> md, l -> lg
  removed headings-margin-bottom variable
  remove kbn test
  Added scopedVars argument in datasourceSrv.get in DataPanel
  heatmap: able to reverse Y buckets order, #15683
  Refactoring of multi-value datasource PR #15812
  ...
2019-03-12 14:34:15 -07:00
ryan e84ddc8e30 more tests 2019-03-12 14:34:01 -07:00
ryan 0446fb9171 more options in storybook 2019-03-12 14:26:07 -07:00
ryan 9016c18088 adding simple widget to pick the reducer 2019-03-12 10:53:28 -07:00
Alexander Zobnin fb3ea93f9d heatmap: fix for negative values 2019-03-12 20:44:05 +03:00
Torkel Ödegaard 54f92514d5 Merge pull request #15950 from grafana/typescript-any-part2
Fixed more typescript no implicit any issues
2019-03-12 18:17:19 +01:00
Torkel Ödegaard e3dd70bce6 Merge pull request #15937 from alexanderzobnin/heatmap-fixes
Heatmap fixes and improvements
2019-03-12 17:57:01 +01:00
Torkel Ödegaard 37496fe6a8 Fixed more typescript no implicit any issues 2019-03-12 17:55:01 +01:00
Torkel Ödegaard ab2caf9ef9 Merge pull request #15943 from grafana/15429-removed-sass-var-in-js
Removed SASS variables being used in JS
2019-03-12 17:18:12 +01:00
Torkel Ödegaard fd8d45fd23 Merge pull request #15947 from grafana/ci-metrics-to-hm-instance
Also push to ci metrics to new shared HM instance
2019-03-12 17:17:07 +01:00
Torkel Ödegaard 4eef407b81 Also push to ci metrics to new shared HM instance 2019-03-12 17:11:47 +01:00
ryan a8c985de60 move sort to table processing 2019-03-12 09:09:33 -07:00
ryan 90510b5ffb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Fixed type issues introduced by adding angular types
  Typescript noAny fixes, start of a long journey
  Updated code stats collection
  Updated path to new script
  POC on collecting metrics in ci process
  renamed default variables: s -> sm, m -> md, l -> lg
  removed gf-form-margin variable and replaced with space- variables where it was used
  heatmap: able to hide buckets with zero value #12080
  s -> sm, m -> md, l -> lg
  heatmap: fix prometheus buckets sorting, closes #15637
  s -> sm, m -> md, l -> lg
  removed headings-margin-bottom variable
  remove kbn test
  Added scopedVars argument in datasourceSrv.get in DataPanel
  Refactoring of multi-value datasource PR #15812
  fixed minor misstake with dashboard padding
  removed -margin, replaced with new general variables
  added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu
  added new variables for spacing, set margins in _cards with new variables
  Make datasource variables multiselect and dashboard repeatable
2019-03-12 09:04:20 -07:00
Torkel Ödegaard 5cabf64fa4 Merge pull request #15946 from grafana/typescript-any-fixes-part1
Progress on fixing typescript noImplicitAny issues
2019-03-12 15:52:42 +01:00
Torkel Ödegaard 3e5016c228 Merge pull request #15941 from grafana/renamed-defaults-size
Renamed default.ts variables
2019-03-12 15:45:12 +01:00
Torkel Ödegaard f477066097 Merge pull request #15940 from grafana/8px-system-margins3
Removed headings-margin-bottom and gf-form-margin
2019-03-12 15:39:52 +01:00
Torkel Ödegaard 4c6f2d6d4a Merge pull request #15912 from grafana/8px-system-margins2
Removed variable $panel-margin
2019-03-12 15:36:59 +01:00
Torkel Ödegaard d7dc6ad3f4 Fixed type issues introduced by adding angular types 2019-03-12 15:27:02 +01:00
Torkel Ödegaard 25b1bec250 Typescript noAny fixes, start of a long journey 2019-03-12 15:14:45 +01:00
Torkel Ödegaard 90cacf717c Merge pull request #15944 from grafana/ci-metrics
Collecting metrics in ci process
2019-03-12 15:13:12 +01:00
Torkel Ödegaard 9f4bca503a Updated code stats collection 2019-03-12 15:08:46 +01:00
Torkel Ödegaard 94677ba874 Updated path to new script 2019-03-12 14:46:38 +01:00
Torkel Ödegaard 3e2350be87 POC on collecting metrics in ci process 2019-03-12 14:42:36 +01:00
Alexander Zobnin c248c1f4f1 changelog: add notes about heatmap issues #15683 #14019 2019-03-12 16:41:55 +03:00
ijin08 dc98fb5e82 added two new variables in default theme for panel padding, replaced panelhorizontalpadding and variables.panelverticalpadding with new variables 2019-03-12 14:24:48 +01:00
ijin08 c54f2912e4 renamed default variables: s -> sm, m -> md, l -> lg 2019-03-12 13:01:22 +01:00
Patrick O'Carroll b2a0c2b6d2 Merge branch 'master' into 8px-system-margins3 2019-03-12 12:42:23 +01:00
Patrick O'Carroll c2f5c12e5a Merge branch 'master' into 8px-system-margins2 2019-03-12 12:41:41 +01:00
Torkel Ödegaard 51c06a8c46 Merge pull request #15901 from grafana/8px-system-margins
8px system margins
2019-03-12 12:31:31 +01:00
ijin08 7a15528223 removed gf-form-margin variable and replaced with space- variables where it was used 2019-03-12 12:30:34 +01:00
Torkel Ödegaard 4ed1fdf754 Merge pull request #15932 from alexanderzobnin/fix-prom-heatmap-sorting
Heatmap: Fixes Y-axis tick labels being in wrong order for some Prometheus queries
2019-03-12 12:27:06 +01:00
Torkel Ödegaard 6f34b1541d Merge pull request #15914 from grafana/multi-valued-datasource-variable
Multi valued datasource variable
2019-03-12 09:48:02 +01:00
Torkel Ödegaard 3e4153a9e3 Merge pull request #15934 from alexanderzobnin/heatmap-hide-zero-buckets
heatmap: able to hide buckets with zero value
2019-03-12 09:32:14 +01:00
ryan b7963f8e87 add table reducer 2019-03-12 01:29:01 -07:00
Dominik Prokop 6d87e82151 Merge pull request #15930 from ryantxu/remove-kbn-test
Remove deprecated kbn test
2019-03-12 09:25:33 +01:00
Alexander Zobnin 9ee2a08def heatmap: able to hide buckets with zero value #12080 2019-03-12 10:59:55 +03:00
ijin08 1432fdd102 Merge branch '8px-system-margins2' of github.com:grafana/grafana into 8px-system-margins3 2019-03-12 08:39:44 +01:00
ijin08 d47f6e5bb3 s -> sm, m -> md, l -> lg 2019-03-12 08:34:55 +01:00
ijin08 3e6c15a88a Merge branch '8px-system-margins' of github.com:grafana/grafana into 8px-system-margins2 2019-03-12 08:31:31 +01:00
Alexander Zobnin 4e22918010 heatmap: fix prometheus buckets sorting, closes #15637 2019-03-12 10:26:20 +03:00
ijin08 a418697453 s -> sm, m -> md, l -> lg 2019-03-12 08:10:31 +01:00
ijin08 204d21abbe removed headings-margin-bottom variable 2019-03-12 08:01:20 +01:00
ryan 6ae0d8e062 rename to displayValues 2019-03-11 22:17:37 -07:00
ryan 152aa76648 merge master 2019-03-11 21:16:51 -07:00
ryan 4ad5e1595b remove kbn test 2019-03-11 21:07:10 -07:00
ryan bf0b9d9fe2 more tests 2019-03-11 21:04:47 -07:00
ryan ada9ac1be1 use new settings 2019-03-11 19:37:10 -07:00
ryan 94799f568e fix tests 2019-03-11 17:52:46 -07:00
ryan df8fc3f7cb Merge remote-tracking branch 'grafana/master' into reusable-formatting-options
* grafana/master:
  Call ora instead of instantiating it
2019-03-11 15:44:16 -07:00
ryan 4783ea629b merge with master 2019-03-11 15:10:11 -07:00
ryan 8cd54c94e9 make value processing reusable 2019-03-11 14:47:54 -07:00
Dominik Prokop 304912f9b4 Merge pull request #15923 from grafana/fix/cli-spinner
Call ora instead of instantiating it
2019-03-11 21:18:49 +01:00
Dominik Prokop 40916a552f Call ora instead of instantiating it 2019-03-11 20:54:11 +01:00
Torkel Ödegaard 6a34eb2d9a Merge pull request #15886 from ryantxu/table-editor
Add a basic table editor to grafana/ui
2019-03-11 18:41:42 +01:00
Torkel Ödegaard aeb3553491 Added scopedVars argument in datasourceSrv.get in DataPanel 2019-03-11 18:36:49 +01:00
Torkel Ödegaard a1b20c8ca9 Merge pull request #15918 from ryantxu/handle-to-on
rename handleXXX to onXX events
2019-03-11 17:58:11 +01:00
ryan 00942ec882 MutableColumn 2019-03-11 09:29:30 -07:00
ryan 455a33bd8e cleanup after review 2019-03-11 09:24:25 -07:00
ryan f4ae0cfaa8 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  fix(explore/logs) not collapsing whitespace (#15737)
  Refactoring / fixing password hint PR #15868
  chore: Move sidemenu out of context service and use the logic we have in the router already for hiding the sidemenu
  Fix deduplication results displaying wrong data (#15755)
  Revert "Fix Datasource Update to no User/Password"
  fix imageurl in notification test
  changed all rems to pixels in defaults and template, changed back root font size
  Make password hint configurable from settings/defaults.ini
  changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used
  fix: Update test snapshot
  fix: Logo goes Home instead of toggling side menu #15482
  Fix: #14706 Incorrect index pattern padding in alerting queries
  Removed commented code
  Fixed alias in Cloudwatch Expressions
2019-03-11 09:06:08 -07:00
ryan 59b5f88798 rename handleXXX to onXX events 2019-03-11 09:03:10 -07:00
ryan cb51f13e69 torkel feedback 2019-03-11 08:34:09 -07:00
ryan c84c77e664 onCellClick 2019-03-11 08:17:59 -07:00
Alexander Zobnin abb8e71fdc heatmap: able to reverse Y buckets order, #15683 2019-03-11 18:02:25 +03:00
Steven Sheehy aa7e348694 fix(explore/logs) not collapsing whitespace (#15737)
- Set container width to 100% so column widths can be calculated properly
- Sets duplicates, level, timestamp, local time to a fixed width based upon em units since the size of these are static
- Sets labels to be 20%
- Remove min-width:80% on message column so that it now consumes remaining space
- Additionally fixes long labels from overflowing into the messages column by properly setting a max-width per label and hiding overflow

closes #15673

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-11 15:55:11 +01:00
Torkel Ödegaard bf72b26c2c Refactoring of multi-value datasource PR #15812 2019-03-11 15:44:11 +01:00
ijin08 fae2f54530 fixed minor misstake with dashboard padding 2019-03-11 15:38:10 +01:00
ijin08 1ad0c7678a removed -margin, replaced with new general variables 2019-03-11 14:47:27 +01:00
Sean Lafferty d922285ab8 Move oauth token migrations in user_auth_mig 2019-03-11 09:31:03 -04:00
Torkel Ödegaard a8486806aa Merge branch 'multiselect-repeatby-datasource' of https://github.com/jdoupe/grafana into jdoupe-multiselect-repeatby-datasource 2019-03-11 14:14:26 +01:00
Torkel Ödegaard 5f6838abca Merge pull request #15847 from grafana/15482-go-home-with-logo
Logo takes you Home instead of toggling side menu #15482
2019-03-11 14:10:15 +01:00
Alexander Zobnin 2085397f31 heatmap: fix middle bucket bound for prometheus 2019-03-11 15:54:40 +03:00
Torkel Ödegaard 26779e0798 Merge PR #15868 password hint 2019-03-11 13:34:39 +01:00
Torkel Ödegaard 06f7a49a61 Refactoring / fixing password hint PR #15868 2019-03-11 13:33:57 +01:00
Johannes Schill 0736b8a1fb chore: Move sidemenu out of context service and use the logic we have in the router already for hiding the sidemenu 2019-03-11 13:18:22 +01:00
Torkel Ödegaard 647cb6ddae Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master 2019-03-11 13:10:45 +01:00
Torkel Ödegaard 4a70d4ef61 Merge pull request #15859 from grafana/font-use-rem-and-variables
Styling update to fonts
2019-03-11 13:09:49 +01:00
Dominik Prokop a853e2c36e Fix deduplication results displaying wrong data (#15755)
The log rows were mutated in the store, what resulted in wrong deduplication results as well as made the selector memoization quirky - for "the same results" the selector was running twice.
2019-03-11 11:48:14 +01:00
ijin08 d55f189749 added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu 2019-03-11 11:33:15 +01:00
bergquist 7aeab0a235 use Get instead of Find 2019-03-11 11:04:56 +01:00
Torkel Ödegaard 90a3bc2203 Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix
Fix: #14706 Incorrect index pattern padding in alerting queries
2019-03-11 11:01:22 +01:00
Torkel Ödegaard 5fab1e89d3 Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
Revert "Fix Datasource Update to no User/Password"
2019-03-11 10:58:28 +01:00
bergquist b2967fbb37 avoid exposing cache client directly 2019-03-11 10:49:56 +01:00
bergquist 085b631099 add docs about remote cache settings 2019-03-11 10:49:56 +01:00
bergquist 7e7427637c renames distcache -> remotecache 2019-03-11 10:49:55 +01:00
bergquist 66e71b66dd renames key to cache_key
apparently key is a reserved keyword in mysql.
and the error messages doesnt mention that.
can I please have 6h back?
2019-03-11 10:49:55 +01:00
bergquist dbc1315d6f build steps for cache servers 2019-03-11 10:49:55 +01:00
bergquist daa3b17951 code layouts and comments 2019-03-11 10:49:42 +01:00
Torkel Ödegaard 3f574d3e57 Merge pull request #15685 from utkarshcmu/fix-#15562
Fixed alias in Cloudwatch Expressions
2019-03-11 10:49:30 +01:00
bergquist 9a78c23165 rename put -> set 2019-03-11 10:49:10 +01:00
bergquist 6231095f72 reverts package.json I made during the flight >.> 2019-03-11 10:49:10 +01:00
bergquist 98f5432659 memcache -> memcached
https://github.com/memcached/memcached
2019-03-11 10:49:09 +01:00
bergquist 995647be2c removes memory as distcache option
if database caching is to expensive if should
not use distcache in the first place.
2019-03-11 10:49:09 +01:00
bergquist b933b4efc8 test redis and memcached during integration tests 2019-03-11 10:49:09 +01:00
bergquist 196cdf9710 adds config to default settings 2019-03-11 10:49:09 +01:00
bergquist f9f2d9fcf3 avoid exporting test helpers 2019-03-11 10:49:09 +01:00
bergquist 33935b09f0 uses set instead of add for memcache
set always sets the value regardless.
2019-03-11 10:49:09 +01:00
bergquist 8db2864fee adds memory as dist storage alt 2019-03-11 10:49:09 +01:00
bergquist a60bb83a70 extract tests into seperate files 2019-03-11 10:49:09 +01:00
bergquist c8ff698d90 avoid exposing internal structs and functions 2019-03-11 10:49:04 +01:00
Alexander Zobnin 57f48f17a0 heatmap: don't display cut cards 2019-03-11 12:42:16 +03:00
Alexander Zobnin bef024e4eb heatmap: fix error when series empty 2019-03-11 11:58:52 +03:00
Alexander Zobnin 9dbcc0fb6e heatmap: middle bucket bound option, #15683 2019-03-11 11:46:30 +03:00
ryan 7054cf8bb5 rotate! 2019-03-11 01:08:00 -07:00
ijin08 7dc4853e91 added new variables for spacing, set margins in _cards with new variables 2019-03-11 08:51:32 +01:00
ryan 61053ec099 better css 2019-03-11 00:45:15 -07:00
Carl Bergquist a6e5e777be Merge pull request #15896 from genofire/patch-1
fix imageurl in notification test
2019-03-11 07:32:14 +01:00
Carl Bergquist f3753712e0 Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
ryan 91a2307b98 rotate! 2019-03-10 23:11:57 -07:00
genofire 6d578dd372 fix imageurl in notification test
skip unnecessary http -> https redirect, which could make problems on some notifiers
2019-03-11 00:23:07 +01:00
ryan 84fa9be29f add comment 2019-03-10 15:51:19 -07:00
ryan eef94b3f08 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  reuse deprecationWarning
  move to string.ts
  move stringToJsRegex
  minor storybook cleanup
  docs: update slack alert notification settings
2019-03-10 15:34:18 -07:00
ryan b80c773ebe attach themes to table story 2019-03-10 15:34:02 -07:00
ryan 0a094c1226 merge master 2019-03-10 13:45:18 -07:00
Torkel Ödegaard fc41d10b9e Merge pull request #15891 from ryantxu/string-utils
move stringToJsRegex to grafana/ui
2019-03-10 19:56:36 +01:00
Dominik Prokop eefba7373d Merge pull request #15890 from ryantxu/storybook-cleanup
Minor storybook cleanup

- DeleteButton should use withCenteredStory like everythign else
- Clicking the 'Red' button should not pick blue :)
2019-03-10 19:42:20 +01:00
Carl Bergquist e46e71bbf3 Merge pull request #15878 from zhulongcheng/docs-add-slack-url
docs: update slack alert notification settings
2019-03-10 19:40:01 +01:00
ryan f7f124c56b reuse deprecationWarning 2019-03-10 10:37:44 -07:00
ryan d13eebfe52 move to string.ts 2019-03-10 10:19:02 -07:00
ryan b2b35fc996 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
2019-03-10 00:17:01 -08:00
ryan b2a7891b08 move stringToJsRegex 2019-03-09 23:50:46 -08:00
ryan 494acddb2f get field mapping to actually work 2019-03-09 23:39:11 -08:00
ryan 1cb03670c4 add variable size storybook 2019-03-09 23:07:42 -08:00
ryan fe22d14e93 cell builder cleanup 2019-03-09 20:47:02 -08:00
ryan 11188b53af minor storybook cleanup 2019-03-09 15:43:49 -08:00
ryan 6494c17cfa fix typos 2019-03-09 15:27:14 -08:00
ryan e2be194b46 autofill space rather than force with/height values 2019-03-09 15:10:06 -08:00
ryan 9134620c1a return table directly, not the debug info 2019-03-09 14:15:41 -08:00
Sofia Papagiannaki 4cf698af10 Minor fix in values to histogram conversion
Filter out values outside the min and max boundaries
because they are assigned to uninitialized buckets
(outside min and max bounds).
2019-03-09 20:36:31 +02:00
Sofia Papagiannaki 5ed3139d5a Fix histogram x-axis min/max
This commit:
*fixes histogram computation when zero x-axis min/max are set
(they used to be ignored).
*validates the user defined x-axis min/max values
and ignores them if they result in invalid bucket sizes.
2019-03-09 20:36:30 +02:00
ryan c7f35f2dcf moved utillities to util 2019-03-09 10:16:43 -08:00
Sofia Papagiannaki 96e1804d55 Change xaxis min and max form input types to number 2019-03-09 17:20:14 +02:00
Sofia Papagiannaki f0d1a9157f Fix histogram xaxis min/max tests 2019-03-09 17:20:14 +02:00
Sofia Papagiannaki 332ecd483f Optionally set histogram x-axis min/max 2019-03-09 17:20:14 +02:00
ryan 078d8f1210 table using MultiGrid 2019-03-09 00:27:33 -08:00
ryan 343e49decb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master: (24 commits)
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  ...
2019-03-08 20:52:30 -08:00
ryan 3bd26df7de cleanup 2019-03-08 20:49:45 -08:00
ryan eca3824e2d cleanup 2019-03-08 20:36:52 -08:00
ryan 40d7ba1e6a adding toolbar 2019-03-08 18:02:52 -08:00
ryan 9df47391ea adding stub table input CSV 2019-03-08 16:49:45 -08:00
Daniel Lee 0ae9c1c5cc Merge pull request #15882 from nowke/patch-1
docs: Fix indentation level for OAuth2 config
2019-03-09 00:35:46 +01:00
Torkel Ödegaard 6d6c7698e4 Merge pull request #15881 from zhulongcheng/docs-Contributing
docs: update CONTRIBUTING.md
2019-03-08 18:55:48 +01:00
Navaneesh Kumar ccdc82b921 docs: Fix indentation level for OAuth2 config 2019-03-08 22:38:50 +05:30
zhulongcheng e08d8eb55d docs: update CONTRIBUTING.md 2019-03-09 00:30:20 +08:00
ryan 7ce7da1251 merge master 2019-03-08 08:27:48 -08:00
ryan 6617a382a3 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master: (23 commits)
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  Update README.md
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  Optimize the Dingding match values format
  ...
2019-03-08 08:25:30 -08:00
zhulongcheng 7743f77e45 docs: update slack alert notification settings
closes #15878
2019-03-09 00:19:21 +08:00
Torkel Ödegaard 570187384b Merge pull request #13825 from athurg/optimize_dingding_alert_message
Optimize dingding alert message
2019-03-08 15:33:24 +01:00
Marcus Efraimsson 80ce11a4a4 docs: update admin and user http api documentation 2019-03-08 15:15:57 +01:00
Marcus Efraimsson 0cd5a6772d feat(api): support list/revoke auth token in admin/current user api 2019-03-08 15:15:38 +01:00
Marcus Efraimsson 8029e48588 support get user tokens/revoke all user tokens in UserTokenService 2019-03-08 15:15:17 +01:00
Dominik Prokop d104ee1c15 @grafana/ui - release docs v1 (#15835)
* Readme update

* Update @grafana/ui Readme qith release process description. Allow version commit creation during release

* Run tests and checks for grafana/core before releasing grafana/ui

* Post review Readme updates
2019-03-08 14:42:19 +01:00
Torkel Ödegaard 4518604cd6 Merge pull request #15446 from grafana/preserve-tags-option
Preserve tags switch option in Save As modal
2019-03-08 14:41:51 +01:00
Marcus Efraimsson 4f48ed3350 Merge pull request #15872 from grafana/15643_fix2
fix allow anonymous server bind for ldap search
2019-03-08 14:25:58 +01:00
Marcus Efraimsson c9e90f8957 Merge pull request #15873 from grafana/13344_fix
add nil/length check when delete old login attempts
2019-03-08 14:25:24 +01:00
Torkel Ödegaard 04c88a226b Minor refactoring of copy tags when saving feature, #15446 2019-03-08 14:24:45 +01:00
Torkel Ödegaard 60272d8a77 Simple implementation for preserve tags, closes #11627 2019-03-08 14:00:44 +01:00
Torkel Ödegaard 2bc573c840 Merge branch 'master' of github.com:grafana/grafana 2019-03-08 13:56:37 +01:00
Torkel Ödegaard 74421ceb13 Updated prettierignore 2019-03-08 13:56:21 +01:00
Torkel Ödegaard 747aa82272 Merge branch 'SamuelToh-11780_wrong_repexp_in_series' 2019-03-08 13:55:53 +01:00
Torkel Ödegaard 878da68c90 Refactoring of PR #14772 2019-03-08 13:55:39 +01:00
corpglory-dev a7bd8d503d Simple storybook 2019-03-08 15:47:15 +03:00
Marcus Efraimsson d7d968412b fix typo in pr template 2019-03-08 13:47:09 +01:00
Torkel Ödegaard 01eb5fade3 Merge branch '11780_wrong_repexp_in_series' of https://github.com/SamuelToh/grafana into SamuelToh-11780_wrong_repexp_in_series 2019-03-08 13:40:50 +01:00
Marcus Efraimsson e3b3062107 add nil/length check when delete old login attempts 2019-03-08 13:31:46 +01:00
Torkel Ödegaard 48114edc86 Minor refactoring of new react text panel 2019-03-08 13:30:47 +01:00
Torkel Ödegaard 90f8179bd2 Merge branch 'alpha-text2' of https://github.com/ryantxu/grafana into ryantxu-alpha-text2 2019-03-08 13:18:06 +01:00
corpglory-dev b8fcd3d962 Improve rendering 2019-03-08 15:17:04 +03:00
Marcus Efraimsson c242d38301 fix allow anonymous server bind for ldap search 2019-03-08 13:16:35 +01:00
ijin08 00ce556bd0 changed all rems to pixels in defaults and template, changed back root font size 2019-03-08 13:02:55 +01:00
corpglory-dev 7bc741c4e2 piechart -> pieChart 2019-03-08 13:51:25 +03:00
corpglory-dev e47769c185 Rename: Piechart -> PieChart 2019-03-08 13:42:41 +03:00
corpglory-dev ef37e95bb7 Import only what is used from d3 2019-03-08 13:33:53 +03:00
ryan 229dff757c less nesting and add test 2019-03-08 02:14:35 -08:00
ryan 188dc86246 remove type field and add helper functions to check if data isTableData 2019-03-08 00:41:35 -08:00
ryan 5aef3bd139 add storybook 2019-03-08 00:28:42 -08:00
bergquist 3890bd14eb fixes typo in redis devenv 2019-03-08 09:09:28 +01:00
bergquist 11d671c637 add support for memcached 2019-03-08 09:09:28 +01:00
bergquist 5ced863f75 add support for redis storage 2019-03-08 09:09:27 +01:00
bergquist d99af23946 add garbage collector for database cache 2019-03-08 09:09:27 +01:00
bergquist 996d5059b1 test at interface level instead impl 2019-03-08 09:09:27 +01:00
bergquist d4f5789660 cache: initial version of db cache 2019-03-08 09:09:27 +01:00
ryan 223906654c don't include stuff from app/... 2019-03-07 18:27:51 -08:00
ryan eed9a2010e fix scss 2019-03-07 17:55:23 -08:00
ryan ad51b069b3 rename to Table 2019-03-07 17:51:45 -08:00
ryan e1324289c8 rename to Table 2019-03-07 17:49:02 -08:00
ryan ca5d7c3510 fix type errors 2019-03-07 17:08:22 -08:00
ryan d7b1fd75e3 move to grafana/ui 2019-03-07 16:52:20 -08:00
ryan 39be5959b8 better sort function 2019-03-07 15:01:36 -08:00
ryan 1609c07fb2 use TableData, not interface 2019-03-07 14:55:30 -08:00
ryan 2db4004d62 Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Update README.md
  Update core:start cli command to watch theme changes again (#15856)
  Updated pull request template
  Updated pull request rtemplate
  Removed title case from issue template title
  Updated issue template titles
  Updated issue templates
  Updated templates
  fix: Update error message and replace npm with yarn #15851
  fix: Make sure we dont add &autofitpanels to the url if it already exists #15849
  Update upgrading.md for wrong spell
  return the same panelData unless it changes
  Map dataSourceTypeSearchQuery state from redux to search input.
  Revert "Fix for leaving playlist mode"
  add new issue templates
2019-03-07 14:20:42 -08:00
Woodward, Joshua 946e542412 Make password hint configurable from settings/defaults.ini 2019-03-07 14:00:04 -08:00
ryan 439b044204 move toTableData to grafana/ui 2019-03-07 13:09:53 -08:00
ryan 8bf57359ab don't require x & y columns for timeSeries 2019-03-07 12:47:21 -08:00
ryan abf015ace2 use TableData for timeseries in react 2019-03-07 12:13:38 -08:00
Matt Toback f9e3c33ebd Update README.md 2019-03-07 14:33:37 -05:00
Alexander Zobnin 7167fa9d07 heatmap: reduce number of legend segments to reasonable value and round x values to prevent gaps 2019-03-07 20:05:32 +03:00
Alexander Zobnin 55d5219a05 heatmap: fix legend padding 2019-03-07 19:49:14 +03:00
Alexander Zobnin c104f31149 heatmap: fix legend for small values, #14019 #15683 2019-03-07 18:57:18 +03:00
corpglory-dev 0f9253fe9d status: alpha 2019-03-07 17:46:50 +03:00
ijin08 c5f4239703 changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used 2019-03-07 15:37:17 +01:00
Torkel Ödegaard 56682cb1eb Merge pull request #15850 from grafana/15849-autofitpanels-in-url
Don't add autofitpanels to the url if it already exists
2019-03-07 13:19:03 +01:00
Dominik Prokop 312ce88e25 Update core:start cli command to watch theme changes again (#15856) 2019-03-07 13:12:10 +01:00
Torkel Ödegaard 2a0122dfbc Merge pull request #15852 from grafana/15851-update-error-message
Update error message and replace npm with yarn
2019-03-07 12:28:11 +01:00
Torkel Ödegaard f71d45b1c1 Updated pull request template 2019-03-07 12:10:25 +01:00
Torkel Ödegaard 8892b933e8 Updated pull request rtemplate 2019-03-07 11:41:07 +01:00
Torkel Ödegaard 708fd6df21 Removed title case from issue template title 2019-03-07 11:12:43 +01:00
Torkel Ödegaard 067f0561d6 Updated issue template titles 2019-03-07 11:09:16 +01:00
Torkel Ödegaard 51178b3f56 Merge pull request #15534 from grafana/issue_templates
New issue templates
2019-03-07 11:07:36 +01:00
Torkel Ödegaard ec1bb7b995 Updated issue templates 2019-03-07 11:07:01 +01:00
Torkel Ödegaard da49fecc30 Updated templates 2019-03-07 10:55:16 +01:00
Johannes Schill d937f1ff21 fix: Update error message and replace npm with yarn #15851 2019-03-07 10:52:24 +01:00
Johannes Schill f3dbdfac07 fix: Make sure we dont add &autofitpanels to the url if it already exists #15849 2019-03-07 10:32:36 +01:00
Johannes Schill 06e9c116af fix: Update test snapshot 2019-03-07 09:54:39 +01:00
Johannes Schill d6449ee629 fix: Logo goes Home instead of toggling side menu #15482 2019-03-07 09:36:40 +01:00
Torkel Ödegaard a826c117e2 Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist
Revert "Fix for leaving playlist mode"
2019-03-07 08:46:14 +01:00
Torkel Ödegaard 12263a3f70 Merge pull request #15838 from aocenas/fix-new-datasource-search
Fix new datasource search input
2019-03-07 08:45:52 +01:00
Torkel Ödegaard 327d1d758d Merge pull request #15841 from ryantxu/fix-15840
return the same panelData unless it changes
2019-03-07 08:44:18 +01:00
Marcus Efraimsson 10d50ea728 Merge pull request #15845 from shafferjohn/patch-1
Update upgrading.md for wrong spell
2019-03-07 08:29:42 +01:00
Shaffer John 272b561958 Update upgrading.md for wrong spell 2019-03-07 11:09:17 +08:00
ryan 3b31341ad9 remove _ 2019-03-06 16:34:32 -08:00
ryan 23c3e9d80a cleanup 2019-03-06 16:25:28 -08:00
ryan 6a8a60bcdf Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  Add a keybinding that toggles all legends in a dashboard
  removed color in color variables names
  changed some more color variables to use variables
2019-03-06 16:03:48 -08:00
ryan 2e8dd19636 use pure component 2019-03-06 15:54:19 -08:00
ryan 627a32e9bb Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master: (40 commits)
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  ...
2019-03-06 15:47:14 -08:00
ryan 82326fed42 return the same panelData unless it changes 2019-03-06 15:18:24 -08:00
ryan 0d8384e05d sortable class 2019-03-06 14:39:04 -08:00
Andrej Ocenas a59e0f1b55 Map dataSourceTypeSearchQuery state from redux to search input. 2019-03-06 22:30:40 +01:00
ryan f7c1842a2b move rendering to its own file 2019-03-06 10:54:47 -08:00
ryan aca69df755 try virtualized 2019-03-06 10:10:04 -08:00
corpglory-dev a23ba378d4 Initial tooltip 2019-03-06 20:32:37 +03:00
Torkel Ödegaard bc2a798158 Merge pull request #15574 from grafana/more-color-variables-use-variables
Changed some more color variables to use variables
2019-03-06 18:07:42 +01:00
Torkel Ödegaard 1ab548f423 Merge pull request #15832 from grafana/stop-playlist
Alternative fix to detecting when to stop a playlist
2019-03-06 17:57:37 +01:00
Torkel Ödegaard 2604e9e433 Minor refactoring of PR #15770 2019-03-06 17:53:14 +01:00
Torkel Ödegaard 18d5c04ae4 Merge branch 'toggle-all-legends' of https://github.com/jsferrei/grafana into jsferrei-toggle-all-legends 2019-03-06 17:48:59 +01:00
Torkel Ödegaard 3895294f97 Revert "Fix for leaving playlist mode" 2019-03-06 17:39:18 +01:00
Torkel Ödegaard 64a7d8cefe Merge pull request #15833 from grafana/15694_fix
fix discord notifier so it doesn't crash when there are no image generated
2019-03-06 17:32:34 +01:00
Torkel Ödegaard 3375c72d56 Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702 2019-03-06 17:30:57 +01:00
ryan 26e3e7146e Merge remote-tracking branch 'grafana/master' into alpha-react-table
* grafana/master: (24 commits)
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  Added first iteration/poc of changelog task
  Enable @grafana/ui version bump based on package.json contents
  Ensure clean master only when publishing package to npm
  ...
2019-03-06 08:21:36 -08:00
Torkel Ödegaard 878b41d666 Merge pull request #15822 from grafana/copy-panel-retain-size
Keep size from copied panel
2019-03-06 17:06:19 +01:00
Torkel Ödegaard d4c337b152 Merge pull request #15830 from grafana/15709-bytes-sec-label
fix: Consistency in unit labels #15709
2019-03-06 17:05:40 +01:00
Marcus Efraimsson f21c976b27 fix discord notifier so it doesn't crash when there are no image generated 2019-03-06 17:03:14 +01:00
Johannes Schill 03e0e1783d fix: Consistency in unit labels #15709 2019-03-06 16:24:49 +01:00
Hugo Häggmark c2598e498a Update latest.json 2019-03-06 16:10:49 +01:00
Hugo Häggmark bfde2cb46f Update CHANGELOG.md 2019-03-06 16:01:22 +01:00
Torkel Ödegaard 71311b1e79 Merge pull request #15827 from grafana/12926_fix
Fix restore to current folder when restoring old dashboard version
2019-03-06 15:38:06 +01:00
Torkel Ödegaard 8e51667371 Merge pull request #15828 from grafana/15771-datasource-url-icon
Add padding to all input fields with help icon
2019-03-06 15:37:02 +01:00
corpglory-dev ce47032ee8 Run prettier 2019-03-06 17:36:07 +03:00
Peter Holmberg 2c1be2c37e position from add panel, dimensions from copied panel 2019-03-06 15:19:58 +01:00
corpglory-dev 3497c36002 Fix donut rendering 2019-03-06 17:12:27 +03:00
Torkel Ödegaard 8ba4eb47e7 Merge pull request #15769 from grafana/15768_xorm_upgrade
upgrade xorm packages to latest versions
2019-03-06 15:11:06 +01:00
Torkel Ödegaard 73980adb17 Merge pull request #15826 from grafana/davkal/15635-vendor-ansicolor-ts
fix(renderer): Vendor ansicolor as typescript
2019-03-06 15:06:46 +01:00
corpglory-dev 7f0e22e288 Run prettier 2019-03-06 17:04:51 +03:00
corpglory-dev 568bc1c72d Fix pieType change 2019-03-06 17:01:30 +03:00
Marcus Efraimsson b63ef54088 changelog: add notes about closing #14509 #15179 2019-03-06 14:49:36 +01:00
corpglory-dev 4cd91ff979 Render svg instead of canvas 2019-03-06 16:49:03 +03:00
Johannes Schill e7297fef06 fix: Add class for input fields with help icon to avoid icon hiding the text #15771 2019-03-06 14:45:13 +01:00
Torkel Ödegaard f22f1ac3d6 Update CHANGELOG.md 2019-03-06 14:41:05 +01:00
Marcus Efraimsson cf500f3157 restore to current folder when restoring old dashboard version 2019-03-06 14:38:40 +01:00
Torkel Ödegaard 08be3b16e3 Merge pull request #15819 from grafana/phantomjs_fixes
log phantomjs output even if it timeout and include orgId when render alert
2019-03-06 14:27:54 +01:00
David Kaltschmidt 26236b4bc3 fix(renderer): Vendor ansicolor as typescript
Fixes #15635

Importing ansicolor from node_modules or vendored as is failed because
there is no ES5 transpiler configured for ES6 libs.

- remove ansicolor from package.json
- add ansicolor to public/vendor/ansicolor and port to typescript
- adapt all ansicolor imports
- add `public/vendor` as a path to be considered by ts compiler
2019-03-06 14:22:59 +01:00
Marcus Efraimsson 1323043bd4 Merge pull request #15805 from grafana/15667_fix
fix only users that can edit a dashboard should be able to update panel json
2019-03-06 13:56:49 +01:00
Marcus Efraimsson 36f3accf0d log phantomjs output even if it timeout and include orgId when render alert 2019-03-06 13:53:23 +01:00
Torkel Ödegaard 63e7330fa0 Merge remote-tracking branch 'origin/cli/refactor-commands' 2019-03-06 13:32:16 +01:00
Torkel Ödegaard aef09fe1df Merge pull request #15801 from grafana/changelog-cli-task
Added first iteration/poc of changelog task
2019-03-06 13:30:27 +01:00
Torkel Ödegaard e9e2c85a72 Merge pull request #15818 from grafana/fix-15631-rendering-timeout
Fixed image rendering issue for dashboards with auto refresh, Fixes #15631
2019-03-06 13:29:18 +01:00
Peter Holmberg db2b8ea602 keep size from copied panel and not from add panel widget 2019-03-06 13:23:11 +01:00
Torkel Ödegaard 7b67dcfbb8 Added basic cherry pick helping task 2019-03-06 13:18:13 +01:00
Peter Holmberg 4e57ead38d Prevent search in VizPicker from stealing focus (#15802)
Fixes #15569 focus issue in viz picker search
* added state to not set focus on search every render
* move to new component to handle focus
2019-03-06 13:07:08 +01:00
Marcus Efraimsson 1a588dadbe fix only users that can edit a dashboard should be able to update panel json 2019-03-06 12:57:19 +01:00
Torkel Ödegaard 153b3e5cf5 Updated changelog task 2019-03-06 12:28:07 +01:00
Torkel Ödegaard 70f1abbe37 Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631 2019-03-06 11:46:38 +01:00
Torkel Ödegaard 72d5215c65 Merge pull request #15783 from grafana/cli/refactor-commands
Minor refactor of cli tasks (core start, @grafana/ui publishing)
2019-03-06 10:36:21 +01:00
ryan 123739fdb4 use props.replaceVariables rather than templateSrv 2019-03-06 01:14:53 -08:00
ryan ea5db92996 Merge remote-tracking branch 'grafana/master' into alpha-react-table
* grafana/master:
  Fixed styling of gicon's in dropdown menus
  cleanup plugin versions
  use explore icon
  fix comments
  typescript functions on replace
  remove console.log
  add ScopedVars to replace function
  Expose onQueryChange to angular plugins
  fix allow anonymous initial bind for ldap search
2019-03-06 00:59:27 -08:00
Torkel Ödegaard 72ca51dadc Updated to add PR author, skip PR issue references 2019-03-06 09:57:45 +01:00
Torkel Ödegaard 10ff3db1ab Added first iteration/poc of changelog task 2019-03-06 09:57:44 +01:00
Dominik Prokop 3fc24fa964 Enable @grafana/ui version bump based on package.json contents 2019-03-06 09:52:31 +01:00
Torkel Ödegaard 85751d9875 Merge pull request #15803 from grafana/15643_fix
fix allow anonymous initial bind for ldap search
2019-03-06 09:35:37 +01:00
Torkel Ödegaard 2039278a93 Merge pull request #15807 from jsferrei/angular-plugin-onquerychange
Expose onQueryChange to angular plugins
2019-03-06 09:28:56 +01:00
Torkel Ödegaard 3aad4e212f Merge pull request #15816 from ryantxu/plugin-page-cleanup
cleanup plugin versions
2019-03-06 09:11:57 +01:00
Torkel Ödegaard 5efa737217 Merge pull request #15814 from ryantxu/replace-scoped-vars
add ScopedVars to props.replaceVariables()
2019-03-06 09:11:35 +01:00
Torkel Ödegaard 176315cf40 Fixed styling of gicon's in dropdown menus 2019-03-06 09:08:17 +01:00
ryan 909d425008 cleanup plugin versions 2019-03-05 23:40:03 -08:00
ryan 5524dacc9d use explore icon 2019-03-05 23:00:43 -08:00
ryan 3dd7d40718 fix comments 2019-03-05 22:18:42 -08:00
ryan aa38a9e0b4 typescript functions on replace 2019-03-05 22:14:28 -08:00
ryan 948729e951 remove console.log 2019-03-05 22:00:12 -08:00
ryan f5aba36814 add ScopedVars to replace function 2019-03-05 21:56:52 -08:00
Jeremy Doupe 3f27d3ea23 Make datasource variables multiselect and dashboard repeatable
closes #7492 (and #7030)
2019-03-05 22:47:22 -06:00
ryan 8cb52ee626 set height 2019-03-05 20:40:34 -08:00
ryan f3712f748a add test file (ignored) 2019-03-05 20:11:14 -08:00
ryan 589229d8af fix variable name 2019-03-05 18:55:09 -08:00
ryan 32543cac10 use typescrit in angular table 2019-03-05 18:23:13 -08:00
ryan 372e892fab use react-table 2019-03-05 18:17:44 -08:00
ryan f59ccdf59c add a basic alpha react table 2019-03-05 16:07:46 -08:00
Dominik Prokop 358f9cbeae Ensure clean master only when publishing package to npm 2019-03-05 21:18:26 +01:00
Dominik Prokop b816b4e259 Remove log 2019-03-05 21:16:34 +01:00
Dominik Prokop 18999df716 Ensuring master branch when performing release 2019-03-05 21:12:21 +01:00
Marcus Efraimsson f845a3b841 upgrade xorm packages to latest versions 2019-03-05 21:11:23 +01:00
Jon Ferreira a3da8dc673 Expose onQueryChange to angular plugins 2019-03-05 15:04:10 -05:00
Daniel Lee b582611004 docker: update prometheus2 block to version 2.7.2 2019-03-05 20:24:31 +01:00
ryan 94b6fc54ff use replaceVariables 2019-03-05 11:14:22 -08:00
ryan c9396b2889 Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master: (57 commits)
  changelog: adds note for #8253
  use default min interval of 1m for sql datasources
  changelog: adds note about closing #15608
  Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711
  Added comment to Docker file
  moving
  style: add gicon-shield to sidemenu class Closes #15591
  remove `UseBool` since we use `AllCols`
  fix: Move chunk splitting from prod to common so we get the same files in dev as prod
  fix: update datasource in componentDidUpdate Closes #15751
  changelog: add notes about closing #15739
  Moved Server Admin and children to separate menu item on Side Menu (#15592)
  update version to 6.1.0-pre
  Viewers with viewers_can_edit should be able to access /explore (#15787)
  Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712
  reordered import
  Wrapperd playlist controls in clickoutsidewrapper
  Turn off verbose output from tar extraction when building docker files, fixes #15528
  Hide time info switch when no time options are specified
  Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757)
  ...
2019-03-05 11:02:03 -08:00
Jon Ferreira 46fa09fdad Add a keybinding that toggles all legends in a dashboard 2019-03-05 13:19:40 -05:00
Torkel Ödegaard 5548aa7c05 Merge pull request #15799 from grafana/15614_fix
use default min interval of 1m for sql datasources
2019-03-05 18:37:51 +01:00
Marcus Efraimsson 3b9f0e6ef2 fix allow anonymous initial bind for ldap search 2019-03-05 18:03:07 +01:00
Torkel Ödegaard 281d9f6058 Merge pull request #15798 from grafana/fixed-scrollbar-not-visible
Fixed scrollbar not visible initially (only after manual scroll)
2019-03-05 17:34:30 +01:00
Daniel Lee 9383b04efd changelog: adds note for #8253 2019-03-05 15:55:10 +01:00
Daniel Lee fe1c204d4a Merge pull request #15290 from mtanda/prometheus_label_names_query
(prometheus) support /api/v1/labels
2019-03-05 15:45:14 +01:00
corpglory-dev d2843879f0 prettier 2019-03-05 17:39:51 +03:00
corpglory-dev 083cc0bbca Aftermerge fixes 2019-03-05 17:15:44 +03:00
corpglory-dev 250ee2298a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-05 17:13:38 +03:00
Torkel Ödegaard 744bf6a784 Merge pull request #15790 from grafana/reduce-log-output-from-docker-build
Turn off verbose output from tar extraction when building docker file
2019-03-05 15:07:15 +01:00
Torkel Ödegaard 6da87a17ef Merge pull request #15793 from grafana/hugoh/bug-can-not-use-testdatasource-in-v6
Update datasource in componentDidUpdate so that datasource is correct in state
2019-03-05 15:06:44 +01:00
Torkel Ödegaard ef59af5e38 Merge pull request #15795 from grafana/split-chunks-in-dev
Split javascript to a vendor chunk in dev-mode
2019-03-05 15:05:03 +01:00
Marcus Efraimsson df60804937 use default min interval of 1m for sql datasources 2019-03-05 15:03:15 +01:00
Torkel Ödegaard a57310efa4 Merge pull request #15796 from grafana/move-unitpicker-to-grafana-uo
Move unitpicker to grafana/ui
2019-03-05 15:01:17 +01:00
bergquist d4c718091c changelog: adds note about closing #15608 2019-03-05 14:41:04 +01:00
Carl Bergquist 71bfefa8fb Merge pull request #15608 from Maddin-619/fix-datasource-update
Fix Datasource Update to no User/Password
2019-03-05 14:38:32 +01:00
Torkel Ödegaard cd78f0bef2 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 2019-03-05 14:32:33 +01:00
Torkel Ödegaard 12b6ab2ddd Merge pull request #15794 from grafana/hugoh/bug-serveradmin-icon-to-dark-in-light-theme
Add gicon-shield to sidemenu class
2019-03-05 13:59:22 +01:00
Torkel Ödegaard a12960e476 Added comment to Docker file 2019-03-05 13:58:43 +01:00
Peter Holmberg ee4df15526 moving 2019-03-05 13:55:29 +01:00
Hugo Häggmark 062b5f26fe style: add gicon-shield to sidemenu class
Closes #15591
2019-03-05 13:46:22 +01:00
bergquist ae9327ff3a remove UseBool since we use AllCols 2019-03-05 13:41:40 +01:00
Torkel Ödegaard 7f283bdfb9 Merge pull request #15792 from grafana/fix-15712-scroll-issue
Fixed scrolling issue that caused scroll to be locked to bottom
2019-03-05 13:32:30 +01:00
Johannes Schill e3ddfccb61 fix: Move chunk splitting from prod to common so we get the same files in dev as prod 2019-03-05 13:29:54 +01:00
Hugo Häggmark 09b036dc93 fix: update datasource in componentDidUpdate
Closes #15751
2019-03-05 13:08:31 +01:00
Marcus Efraimsson ff7eaced25 changelog: add notes about closing #15739 2019-03-05 13:04:00 +01:00
Hugo Häggmark d3642a3e91 Moved Server Admin and children to separate menu item on Side Menu (#15592)
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
2019-03-05 13:02:41 +01:00
Marcus Efraimsson e3d08e24f3 update version to 6.1.0-pre 2019-03-05 12:58:02 +01:00
Johannes Schill a81d5486b0 Viewers with viewers_can_edit should be able to access /explore (#15787)
* fix: Viewers with viewers_can_edit should be able to access /explore #15773

* refactoring initial PR a bit to simplify function and reduce duplication
2019-03-05 12:41:01 +01:00
Torkel Ödegaard be8f60b0bf Merge pull request #15791 from grafana/fix/leave-playlist
Fix for leaving playlist mode
2019-03-05 12:38:14 +01:00
Torkel Ödegaard e6a83bf0e1 Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712 2019-03-05 12:37:19 +01:00
Torkel Ödegaard a73663de41 Merge pull request #15789 from grafana/hide-time-info
Hide time info switch when no time options are specified
2019-03-05 12:15:45 +01:00
Peter Holmberg a158a19272 reordered import 2019-03-05 12:10:20 +01:00
Peter Holmberg 978cdfba00 Wrapperd playlist controls in clickoutsidewrapper 2019-03-05 12:08:57 +01:00
Torkel Ödegaard 66d9b12981 Turn off verbose output from tar extraction when building docker files, fixes #15528 2019-03-05 12:03:48 +01:00
Torkel Ödegaard c813a9953a Merge pull request #15786 from grafana/react-select-upgrade
Updated react select fork to 2.4.1
2019-03-05 11:44:03 +01:00
Torkel Ödegaard a5455691b3 Hide time info switch when no time options are specified 2019-03-05 11:43:25 +01:00
Torkel Ödegaard 1711622eff Merge pull request #15784 from grafana/15782-error-fix
In error popup, fixes bug so that string errors are shown again. Fixes #15782
2019-03-05 10:52:47 +01:00
Hugo Häggmark 48570c6272 Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757)
* Fixed #15682 

* fix: Add hideTimeOverride to state since we need to control the Switch

* fix: Back the maxDataPoints change, we need to keep it as a string

Co-authored-by:johannes.schill@polyester.se
2019-03-05 10:49:45 +01:00
Torkel Ödegaard fde63fc1cf Updated react select fork to 2.4.1 2019-03-05 10:47:52 +01:00
Daniel Lee 8b1e25b50a utils: show string errors. Fixes #15782 2019-03-05 09:32:02 +01:00
Torkel Ödegaard 590450291a Update frontend.md 2019-03-05 09:23:04 +01:00
Torkel Ödegaard 707d0e13bd Update frontend.md 2019-03-05 09:22:26 +01:00
Torkel Ödegaard b787811da8 Merge pull request #15761 from grafana/15708_access
fix: limit access to org admin and alerting pages
2019-03-05 09:17:20 +01:00
Torkel Ödegaard 0016ad2cb3 Merge pull request #15774 from ryantxu/set-options
Rename PanelEditorProps.onChange to onOptionsChange
2019-03-05 09:11:56 +01:00
Torkel Ödegaard 57810ea5e5 Merge pull request #15775 from ryantxu/rename-interpolate
use replaceVariables rather than onInterpolate
2019-03-05 09:10:45 +01:00
Dominik Prokop 73ef864979 Minor refactor of cli tasks (core start, gui publishing) 2019-03-05 08:56:29 +01:00
Dominik Prokop cee5f030dc Fixed url of back button in datasource edit page, when root_url configured (#15759)
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
2019-03-05 07:35:45 +01:00
Leonard Gram 1e52a1f9a5 Merge pull request #15539 from grafana/repo-recreation-documentation
docs: howto for recreating our debian repositories.
2019-03-05 07:18:39 +01:00
Torkel Ödegaard e8d6e4fb48 Merge pull request #15778 from roidelapluie/patch-2
Add #15752 in CHANGELOG
2019-03-05 06:05:28 +00:00
Julien Pivotto 8f9246dff0 Add #15752 in CHANGELOG 2019-03-04 23:17:33 +01:00
ryan 3d16528459 use onOptionsChange 2019-03-04 12:35:24 -08:00
ryan 251008f590 use replaceVariables rather than onInterpolate 2019-03-04 11:44:38 -08:00
ryan 77d709d9df use updateOptions rather than onChange 2019-03-04 11:21:05 -08:00
Marcus Efraimsson 989147a1ce changelog: add notes about closing #15650 2019-03-04 17:47:16 +01:00
Marcus Efraimsson 646ca90b10 Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode
No scroll in autofitpanel-mode
2019-03-04 08:44:28 -08:00
Marcus Efraimsson a6056ba565 changelog: add notes about closing #15765 2019-03-04 17:38:27 +01:00
Marcus Efraimsson 947b38b379 Merge pull request #15766 from grafana/15765-kiosk-mode-url
fix: Kiosk mode should have &kiosk appended to the url
2019-03-04 08:36:14 -08:00
Johannes Schill 92ec8757d3 fix: Kiosk mode should have &kiosk appended to the url #15765 2019-03-04 16:33:00 +01:00
Marcus Efraimsson c36047674a changelog: add notes about closing #15077 2019-03-04 16:07:51 +01:00
Marcus Efraimsson 3832eba31f Merge pull request #15077 from activeshadow/aws-rds-max-xids
Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics.
2019-03-04 07:05:19 -08:00
Marcus Efraimsson 5638c67be8 org admins should only be able to access org admin pages 2019-03-04 15:51:18 +01:00
Marcus Efraimsson a29b99b96b only editor/admin should have access to alert list/notifications pages 2019-03-04 15:48:07 +01:00
Bryan T. Richardson ae23773db3 Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics. 2019-03-04 07:38:36 -07:00
Johannes Schill cc40a515be fix: When in tv-mode, autofitpanel should not take space from the navbar #15650 2019-03-04 13:46:10 +01:00
Torkel Ödegaard 1312789d1d Merge pull request #15753 from xlson/devenv-influx-fix
devenv: fixes incorrect influxdb config.
2019-03-04 11:36:51 +00:00
Torkel Ödegaard 7540527010 Merge pull request #15612 from jsferrei/upstream_stacking_fix
Toggle stack should trigger a render, not a refresh
2019-03-04 10:54:36 +00:00
Torkel Ödegaard 28cac0976d Merge pull request #15752 from grafana/hugoh/bug-repeated-row-gauge
Passing scopedVars down to DataPanel from PanelChrome
2019-03-04 10:53:07 +00:00
Leonard Gram 818ccb572e devenv: fixes incorrect influxdb config.
[skip ci]
2019-03-04 11:23:33 +01:00
Hugo Häggmark 3a65e27e83 Fixes #15739 2019-03-04 10:42:59 +01:00
Torkel Ödegaard b4df0e73cd Merge pull request #15706 from grafana/15656-playlists-with-tags-rebased
wip: Fix playlists "by tags"
2019-03-04 09:00:28 +00:00
parry 25b09168eb Don't mutate seriesList parameter in mergeSeriesByTime (#15619)
* do not mutate seriesList in mergeSeriesByTime

* extendedseriesList -> extendedDatapointsList

* remove toString() from datapoints, since the value can be null
2019-03-04 09:56:47 +01:00
Marcus Efraimsson 6fd6f893aa new stable docs version 2019-03-04 00:38:19 -08:00
Torkel Ödegaard 328eea3a29 Merge pull request #15713 from grafana/scrollbar-right-side
Fixed right side scrollbar margin on dashboard page
2019-03-04 08:13:01 +00:00
Torkel Ödegaard c28fc9f4a7 Merge pull request #15742 from grafana/fix-15664/bits-showing-as-d
Fixing bits valueFormat
2019-03-04 08:06:36 +00:00
sandeep e04218e550 Fix: #14706 Incorrect index pattern padding in alerting queries
When weekly index pattern is used, indices names contain single digit week number for week 1-9
This fix makes sure indice names always contain 2 digit week number for weekly pattern
2019-03-03 18:10:38 +05:30
Peter Holmberg a9ca8e9dec fix 2019-03-02 13:51:55 -08:00
Marcus Efraimsson 0114ffc9ac Merge pull request #15671 from bendrucker/patch-1
Fix style and grammar in 6.0 announcement
2019-03-02 13:42:35 -08:00
bergquist 27dc3586b1 changelog: adds note about closing #14239 2019-03-02 21:27:09 +01:00
Marcus Efraimsson d49f0bedd3 fix: prevent datasource json data stored as nil (#15508)
prevent datasource json data stored as nil

closes #14239
2019-03-02 21:18:26 +01:00
Carl Bergquist 06de01dc23 Merge pull request #15458 from bergquist/integration_tests_all_packages
run db tests in all packages
2019-03-02 21:11:53 +01:00
bergquist cde3a21434 changelog: adds note about closing #10506 2019-03-02 20:37:36 +01:00
bergquist dafd7afb97 changelog: adds note about closing #15651 2019-03-02 20:35:53 +01:00
Samuel 41024c29bb Return 404 on user not found (#15606)
Return 404 on user not found

closes #10506
2019-03-02 20:34:48 +01:00
Carl Bergquist 1e719bb3db Merge pull request #15659 from xlson/interl-metrics-fix
service: fix for disabled internal metrics.
2019-03-02 18:51:40 +01:00
SamuelToh d2c161c2e6 Catch bad regex exception at controller level 2019-03-02 20:50:25 +10:00
corpglory-dev 6e320679d4 Prettier fix 2019-03-01 22:03:19 +03:00
corpglory-dev 0ab3a80016 Add PiechartOptionsBox 2019-03-01 21:42:15 +03:00
corpglory-dev f4f8e0d79a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-01 20:55:19 +03:00
Leonard Gram 1bcaaccb96 docs: missing field added to example
Closes #15715
2019-03-01 16:07:34 +01:00
SamuelToh 6bfbdbe20b 11780: invalid reg value can cause unexpected behaviour 2019-03-01 20:34:40 +10:00
ryan d3cbc5638c Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master:
  Explore: Enable click on name label
  Bumping grafana ui version (#15669)
  Need this to be available for plugins
  docs: 6.0 whats new
  Updated latest.json with 6.0
  Update CHANGELOG.md
  docs: grafana 6.0 has been released.
  moves social package to /login
  moves tracing packge into /infra
  Update CHANGELOG.md
  changelog: adds notes for #14509 and #15179
  graph: fixes click after scroll in series override menu
  moves metric package to /infra
  stackdriver: change reducer mapping for distribution metrics
  stackdriver: fix for float64 bounds for distribution metrics
  Fixed value dropdown not updating when it's current value updates, fixes #15566
2019-02-28 10:07:53 -08:00
Torkel Ödegaard 84b2c0447e Fixed right side scrollbar margin on dashboard page 2019-02-28 08:29:18 -08:00
Johannes Schill 8d5ccc7831 fix: Return url when query dashboards by tag 2019-02-28 10:44:39 +01:00
corpglory-dev 17c4b7096e Fix prettier 2019-02-27 20:48:55 +03:00
corpglory-dev 81c140b425 Initial rendering 2019-02-27 20:07:58 +03:00
corpglory-dev b48f8bcf4c Add PiechartType enum 2019-02-27 20:04:57 +03:00
corpglory-dev bc9d4e07d0 Install d3 2019-02-27 17:33:52 +03:00
corpglory-dev 6114097668 Remove extra props 2019-02-27 17:33:18 +03:00
corpglory-dev e842e86e2a Merge branch 'master' into piechart-react 2019-02-27 16:09:13 +03:00
utkarshcmu 37033080b7 Removed commented code 2019-02-27 00:33:40 -08:00
utkarshcmu 8ef3aebc29 Fixed alias in Cloudwatch Expressions 2019-02-27 00:20:29 -08:00
Dominik Prokop 1478f38dd9 Merge pull request #15678 from grafana/davkal-fork/fix-14654
Explore: Enable click on name label
2019-02-27 01:01:50 +01:00
David Kaltschmidt 539333bb01 Explore: Enable click on name label
- click on the name label in a prometheus table was disabled
- it was disabled because every query used to have a metric which is no
longer true
- this change enables it
2019-02-26 14:21:46 -08:00
Peter Holmberg 8bdf2111c4 Bumping grafana ui version (#15669)
grafana/ui 6.0.1-alpha.0 release version bump
2019-02-26 20:51:52 +01:00
Ben Drucker e7b630e633 Style and grammar fixes 2019-02-26 11:34:49 -08:00
Torkel Ödegaard 29f53fb5ce big text option 2019-02-26 10:37:17 -08:00
Peter Holmberg 4521a3d419 Merge pull request #15668 from grafana/export-value-mapping-utils
Need this to be available for plugins
2019-02-26 09:49:39 -08:00
Peter Holmberg 1bffde57e3 Need this to be available for plugins 2019-02-26 09:22:21 -08:00
Leonard Gram 36788183d8 service: fix for disabled internal metrics.
Update of the internal metrics for Grafana was
disabled by mistake when refactoring the code.

Fixes #15651
2019-02-26 11:41:55 +01:00
Leonard Gram c04395ce3a docs: 6.0 whats new 2019-02-25 19:25:47 +01:00
Jon Ferreira 0bdca7957a Toggle stack should trigger a render, not a refresh 2019-02-25 11:29:34 -05:00
Leonard Gram 3c3e06515e Updated latest.json with 6.0 2019-02-25 17:09:49 +01:00
Leonard Gram e1d27bd79a Update CHANGELOG.md 2019-02-25 16:24:02 +01:00
Leonard Gram cab90ef4f9 Merge pull request #15640 from xlson/docs-6.0-released
docs: grafana 6.0 has been released.
2019-02-25 16:19:13 +01:00
Carl Bergquist 369aa2d5dd Merge pull request #15628 from bergquist/move_tracing_infra
moves tracing packge into /infra
2019-02-25 16:16:45 +01:00
Carl Bergquist 1aeec31495 Merge pull request #15630 from bergquist/moves_social_to_login
moves social package to /login
2019-02-25 16:16:20 +01:00
Leonard Gram 38a116d0f7 docs: grafana 6.0 has been released. 2019-02-25 15:45:35 +01:00
bergquist 60fef31748 moves social package to /login
ref #14679
2019-02-25 15:30:40 +01:00
bergquist 0c67194b45 moves tracing packge into /infra 2019-02-25 15:29:25 +01:00
Leonard Gram 26dcabc2dc Update CHANGELOG.md 2019-02-25 13:00:18 +01:00
Leonard Gram ccc97ed649 Merge pull request #15634 from grafana/15621-series-overrides
graph: fixes click after scroll in series override menu
2019-02-25 12:50:06 +01:00
Leonard Gram 5ff44bdbcf Merge pull request #15616 from grafana/fixed-variable-dropdown-update
Fixed value dropdown not updating when it's current value updates
2019-02-25 09:39:28 +01:00
Daniel Lee 9efe7674d6 changelog: adds notes for #14509 and #15179 2019-02-25 02:46:05 +01:00
Carl Bergquist 0aa61c8e12 Merge pull request #15629 from bergquist/moves_metrics_to_infra
moves metric package to /infra
2019-02-25 02:44:09 +01:00
Daniel Lee 9240d850b4 Merge pull request #15623 from grafana/stackdriver-bounds
stackdriver: fix for float64 bounds for distribution metrics
2019-02-25 02:32:28 +01:00
Daniel Lee 3a6f49837d Merge pull request #15624 from grafana/15179-reducers
stackdriver: change reducer mapping for distribution metrics
2019-02-25 02:30:08 +01:00
Daniel Lee e76655df43 graph: fixes click after scroll in series override menu
Makes changes to dropdown-typeahead2 so that a css
class for the button can be passed in. Means it can
be used instead of dropdown-typeahead.

Switches to using dropdown-typeahead2 for series_overrides
directive and for the influxdb, mysql and postgres datasources
as it already contains a fix for this issue.

This commit also fixes the index property which
was set using an incorrectly spelled length property in the
series_overrides directive.

Closes #15621
2019-02-25 02:11:28 +01:00
bergquist 8a3a3cccc3 moves metric package to /infra
ref #14679
2019-02-24 21:12:51 +01:00
David Kaltschmidt e6a74eb1a2 Explore: Make sure line graphs get different colors
- lines for graphs from different query rows end up in different
transactions
- within each transaction the color distribution resets leading to color
overlap
- this change takes existing transaction colors into account
2019-02-24 10:01:50 -08:00
Daniel Lee 35fc0c5329 stackdriver: change reducer mapping for distribution metrics
- Distribution metrics are now mapped to more reducers
when the metric kind is cumulative.
- The witdth of the metrics dropdown is now much wider.
- Changed the text from Select Aggregation to Select Reducer
to line up with the UI in Stackdriver.
2019-02-24 17:44:15 +01:00
Daniel Lee d1e249a803 stackdriver: fix for float64 bounds for distribution metrics
Adds support for explicit distribution metrics and float64 bounds

Fixes #14509
2019-02-24 17:37:26 +01:00
ryan e5ce759167 update 2019-02-23 21:53:20 -08:00
Torkel Ödegaard 88e1e83800 style tweaks 2019-02-23 15:02:25 +01:00
Torkel Ödegaard 72943af46a Refactoring orientation stuff 2019-02-23 14:59:26 +01:00
Torkel Ödegaard bce6f75fdc Refactoring bar gauge 2019-02-23 14:00:25 +01:00
Torkel Ödegaard 92c7303615 Refactoring bar gauge 2019-02-23 13:28:27 +01:00
Torkel Ödegaard a27c55b53d Added missing file 2019-02-23 12:14:50 +01:00
Torkel Ödegaard 5590b026d0 refactoring repeater and code in gauge and bar gauge to reuse more code 2019-02-23 11:31:35 +01:00
Marcus Efraimsson e6830b0681 Merge pull request #15240 from grafana/azure-monitor-docs
Azure Monitor docs
2019-02-23 11:14:35 +01:00
Marcus Efraimsson 3c911cf208 docs: link to azure monitor from what's new in v6.0 2019-02-23 11:05:11 +01:00
Torkel Ödegaard f768808b6e Fixed value dropdown not updating when it's current value updates, fixes #15566 2019-02-23 08:59:00 +01:00
Daniel Lee 31ae2813a7 docs: tweaks to AzureMonitor docs 2019-02-22 18:45:24 +01:00
Hugo Häggmark 8f62082482 Added feature toggle to defaults.ini and sample.ini after PR comments 2019-02-22 14:39:22 +01:00
Hugo Häggmark 769ad21e16 Moved variable to config struct after PR comments 2019-02-22 14:39:22 +01:00
Hugo Häggmark 9c9691f7af Added feature toggle editors_can_own 2019-02-22 14:39:22 +01:00
Maddin-619 09cd173e92 updates all cols except created so user and password
of the database can be chaned to no user and password
2019-02-22 14:19:15 +01:00
Hugo Häggmark dafcfd70a7 Fixed bug with getting teams for user 2019-02-22 14:07:18 +01:00
Valentin Agachi 425636ff70 Improve Loki logs render with ANSI colors (#15558)
* Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors
2019-02-22 13:13:10 +01:00
Dominik Prokop c4c150bd15 Merge pull request #15604 from grafana/grafanaui/version-bump
grafana/ui 6.0.0-alpha.0 release version bump
2019-02-22 11:53:23 +01:00
Dominik Prokop 34f6d9ab8e grafana/ui 6.0.0-alpha.0 release version bump 2019-02-22 11:30:45 +01:00
Torkel Ödegaard ed06f04899 Merge pull request #15570 from grafana/15563-plugin-text-mode
panel: defensive coding that fixes #15563
2019-02-22 09:00:41 +01:00
Dominik Prokop f6f484ebea Merge pull request #15589 from grafana/grafanaui/alpha-release
grafana/ui 1.0.0-alpha.0 release - package version bump
2019-02-22 08:58:00 +01:00
ijin08 05d5e796d7 removed color in color variables names 2019-02-22 08:33:07 +01:00
Marcus Efraimsson d358088776 changelog: add notes about closing #15303 2019-02-22 00:29:46 +01:00
Marcus Efraimsson ad748c0502 changelog: add notes about closing #1441 2019-02-22 00:23:10 +01:00
Marcus Efraimsson 60fab15335 update changelog 2019-02-22 00:19:08 +01:00
Dominik Prokop c1d0f11c47 grafana/ui 1.0.0-alpha.0 release 2019-02-21 22:22:35 +01:00
Dominik Prokop 67d0bca3cb Merge pull request #15579 from grafana/fix/bring-plugins-scss-back
Bring back plugins page styles
2019-02-21 22:14:51 +01:00
Dominik Prokop 38fc55e09b Merge pull request #15561 from grafana/tooling/npm-scripts
@grafana/ui publishing scripts
2019-02-21 22:07:57 +01:00
Dominik Prokop 167a18f1f2 Merge branch 'master' into tooling/npm-scripts 2019-02-21 21:28:16 +01:00
Dominik Prokop 10916d9192 Update grafana/ui readme 2019-02-21 17:45:52 +01:00
Marcus Efraimsson 7ea361513d docs: landing page update
link to what's new in v6.0
add azure monitor and loki to datasource list
change stackdriver icon to a bigger one
2019-02-21 17:39:03 +01:00
Johannes Schill 5054e841ba Merge pull request #15551 from grafana/15281-dashboard2explore
fix: Filter out values not supported by Explore yet #15281
2019-02-21 16:38:32 +01:00
Dominik Prokop f471be2453 Bring back plugins page styles 2019-02-21 16:37:42 +01:00
Marcus Efraimsson ca9a528a62 docs: layout fixes 2019-02-21 16:12:25 +01:00
Peter Holmberg 73b4d817e4 prettier fix 2019-02-21 16:07:07 +01:00
Dominik Prokop c1bacd630f Make published package public by default 2019-02-21 15:56:57 +01:00
Marcus Efraimsson ae13352956 docs: fix link 2019-02-21 15:50:18 +01:00
Marcus Efraimsson df984059db docs: fix order of datasources in menu/index and update alert support 2019-02-21 15:43:54 +01:00
Dominik Prokop db58ab6c02 Fixed prettier issue in color picker 2019-02-21 15:40:43 +01:00
Marcus Efraimsson 535287608a Merge pull request #15576 from grafana/fix/yarn-docs
Update docs to match current npm scripts
2019-02-21 15:17:43 +01:00
Dominik Prokop 58e1a8bd3c Update docs to match current npm scripts 2019-02-21 15:13:59 +01:00
Dominik Prokop 394ee5dc08 Added keywords and description go grafana/ui package 2019-02-21 15:12:23 +01:00
Dominik Prokop 996588528a Fixed failing tests because of circular dependency 2019-02-21 15:12:23 +01:00
Dominik Prokop 75e9c1e8fc Fix version and name in grafana/ui package.json 2019-02-21 15:12:22 +01:00
Dominik Prokop d4c40e4360 Imports updates 2019-02-21 15:12:22 +01:00
Peter Holmberg 362829d7ad Merge branch 'master' into bar-gauge-poc 2019-02-21 15:08:49 +01:00
Dominik Prokop 529c1ea53d Implemented scripts for building and releasing grafana/ui 2019-02-21 15:06:29 +01:00
ijin08 7be18e1a08 changed some more color variables to use variables 2019-02-21 15:05:17 +01:00
Peter Holmberg f3ff3c1aec fixed tests 2019-02-21 14:44:21 +01:00
Daniel Lee bd0f55cbb8 panel: defensive coding that fixes #15563
If a plugin incorrectly uses an attribute in the
query-editor-row directive, it should not throw
an exception.
2019-02-21 14:42:31 +01:00
Torkel Ödegaard 72e269c8f3 Merge pull request #15572 from grafana/gauge-minor-fix
Minor fix/polish to gauge panel and threshold editor
2019-02-21 14:29:28 +01:00
Torkel Ödegaard b4627ec302 Minor fix/polish to gauge panel and threshold editor 2019-02-21 13:44:05 +01:00
Peter Holmberg 89883c2cf6 copying options between visualizations 2019-02-21 13:43:36 +01:00
Torkel Ödegaard 745fd68571 fixed issue in dark sass template 2019-02-21 12:39:22 +01:00
Torkel Ödegaard 67e39a5562 Merge branch 'cli/watch-sass-var-new-colors' 2019-02-21 12:33:10 +01:00
Torkel Ödegaard 3868602581 Updated body & page variables to use variables from code theme 2019-02-21 12:32:29 +01:00
Torkel Ödegaard b21eb36909 Merge branch 'master' of github.com:grafana/grafana 2019-02-21 12:18:34 +01:00
Torkel Ödegaard aa589d7217 Merge pull request #15564 from grafana/fixed-snapshots
fixed snapshots failing in master
2019-02-21 12:17:30 +01:00
Torkel Ödegaard 8e21717c12 updated building from source docs 2019-02-21 12:17:02 +01:00
Torkel Ödegaard ffe5157193 Merge branch 'cli/watch-sass-var' of github.com:grafana/grafana into cli/watch-sass-var 2019-02-21 12:11:21 +01:00
Torkel Ödegaard 31511ee3cc fixed snapshots failing in master 2019-02-21 12:10:01 +01:00
Dominik Prokop f5a520bf39 Synced variable template files 2019-02-21 11:59:47 +01:00
Dominik Prokop 0df56f9356 Merge branch 'master' into cli/watch-sass-var 2019-02-21 11:56:54 +01:00
Marcus Efraimsson c586bc519f Merge pull request #15553 from grafana/14507_fix
fix; mysql query using __interval_ms variable throws error
2019-02-21 11:40:54 +01:00
Torkel Ödegaard 9a7866a040 Merge pull request #15560 from grafana/scrollbar-fixes
Fixed scrollbar issue introduced in theme changes
2019-02-21 11:32:19 +01:00
corpglory-dev 8bc4139bbd Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-21 12:47:05 +03:00
Peter Holmberg 58f194b483 Merge branch 'master' into bar-gauge-poc 2019-02-21 10:38:26 +01:00
Marcus Efraimsson d8e655bbcf fix: mysql query using __interval_ms variable throws error
fixes #14507
2019-02-21 10:25:52 +01:00
Dominik Prokop 9b03815141 Merge branch 'master' into cli/watch-sass-var 2019-02-21 09:50:24 +01:00
Torkel Ödegaard d85ea5d2be Merge pull request #15559 from grafana/fix/prettier-function-editor
Fixed issue caused by graphite function editor PR #15510
2019-02-21 09:46:50 +01:00
Torkel Ödegaard 7d105439f9 Fixed scrollbar issue introduced in theme changes 2019-02-21 09:41:53 +01:00
Dominik Prokop f28cc871e1 Fix build 2019-02-21 09:09:24 +01:00
Peter Holmberg 8c5c953521 minor touch ups 2019-02-20 17:07:36 +01:00
Alexandre de Verteuil 1bbf7cc294 Fix heading levels in generic-oauth.md 2019-02-20 11:00:29 -05:00
ijin08 a9c5fe5be1 updated colors in light, dark and theme files, in template file basic colors uses variables from dark/light files, also changed to -basic in some files 2019-02-20 16:11:36 +01:00
corpglory-dev 5da9794a8e ValueOptions -> PiechartValueEditor 2019-02-20 17:30:12 +03:00
corpglory-dev 0f102001b6 Make it build 2019-02-20 17:27:42 +03:00
corpglory-dev 7f5459149a fixes 2019-02-20 17:15:00 +03:00
Peter Holmberg 2fc136e615 added orientation option 2019-02-20 15:07:30 +01:00
corpglory-dev 67fe351f72 export PiechartDataPoint from @grafana/ui 2019-02-20 16:52:29 +03:00
corpglory-dev b263b3edd6 change valueOptions 2019-02-20 16:32:35 +03:00
corpglory-dev 7bb996203f get label and color from series 2019-02-20 16:30:55 +03:00
corpglory-dev e867a8f402 prettier fix 2019-02-20 16:08:13 +03:00
corpglory-dev 4edd22589c Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-20 14:54:26 +03:00
corpglory-dev 3ab00dfb9a PieChartDataPoint -> PiechartDataPoint 2019-02-20 14:54:08 +03:00
corpglory-dev 76aa208d2a Rename PieChartPanelEditor to PiechartPanelEditor 2019-02-20 14:52:46 +03:00
Torkel Ödegaard 44af31585f Merge branch 'master' into cli/watch-sass-var 2019-02-20 11:15:30 +01:00
Torkel Ödegaard 20a03db144 Merge pull request #15510 from grafana/fix/graphite-func-editor
Display graphite function name editor in a tooltip
2019-02-20 10:48:08 +01:00
Torkel Ödegaard cdac119397 Merge pull request #15542 from grafana/15541-dashboard-model
Pass dashboardModel to PanelCtrl class. Fixes #15541
2019-02-20 09:11:00 +01:00
Daniel Lee 8e90899c02 docs: adds Azure Monitor docs
A copy of the docs from the plugin with some additions and
new images.
2019-02-19 23:33:26 +01:00
Dominik Prokop 5f4f559d19 Fix blue in dark theme 2019-02-19 21:23:04 +01:00
Dominik Prokop 56726397e3 Readme update 2019-02-19 21:15:36 +01:00
corpglory-dev 77f848b56d Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 21:27:22 +03:00
corpglory-dev d1ef95b936 Minor fixes 2019-02-19 21:26:28 +03:00
corpglory-dev 52e53e39a4 Review fixes 2019-02-19 21:14:24 +03:00
corpglory-dev 0633dba302 Fixes after merging #15468 2019-02-19 21:14:05 +03:00
Daniel Lee c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01:00
corpglory-dev a053fb5908 Add piechart to builtInPlugins 2019-02-19 20:24:50 +03:00
corpglory-dev eaf60d3eb8 logo: svg -> png 2019-02-19 19:35:57 +03:00
Dominik Prokop d19616a16b Merge branch 'master' into cli/watch-sass-var 2019-02-19 17:27:25 +01:00
Dominik Prokop 83bb3fb8d4 Remove old overwritten sass vars 2019-02-19 17:05:50 +01:00
Peter Holmberg 4c5c162045 first draft of repeater component 2019-02-19 17:03:28 +01:00
Leonard Gram dc155dfa2f docs: howto for recreating our debian repositories. 2019-02-19 16:52:47 +01:00
Johannes Schill 6f9edf4a22 fix: Filter out values not supported by Explore yet #15281 2019-02-19 16:43:39 +01:00
Peter Holmberg 0de9c03879 Merge branch 'gauge-multi-series' into bar-gauge-poc 2019-02-19 15:53:05 +01:00
Peter Holmberg 5f56a07a23 Merge branch 'master' into bar-gauge-poc 2019-02-19 15:43:08 +01:00
Dominik Prokop 88a46e6dd4 Bump Prettier version (#15532)
* Fix prettier version to 1.16.4
2019-02-19 15:41:35 +01:00
corpglory-dev 98b22a83af Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 16:06:00 +03:00
ijin08 2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00
ijin08 547696af19 updated theme template files variables to master 2019-02-19 13:40:43 +01:00
Marcus Efraimsson df2f33b5b1 add new issue templates 2019-02-19 13:31:32 +01:00
Torkel Ödegaard 5b1cf9c94f Merge pull request #15530 from grafana/graph2-using-reactpanelplugin
graph2 should use ReactPanelPlugin from @grafana/ui
2019-02-19 12:08:02 +01:00
Torkel Ödegaard 3f1c4c3ed9 Merge pull request #15531 from grafana/hugoh/react-switch-works-outside-switch
Surrounded Switch with div to restrict size
2019-02-19 12:06:59 +01:00
Hugo Häggmark d2893c2d1a Fixes #15506 2019-02-19 11:17:40 +01:00
Torkel Ödegaard baddf42c8e Merge pull request #15515 from grafana/13767_fix
fix native annotation filtered by template variable with pipe
2019-02-19 11:14:04 +01:00
Torkel Ödegaard fb3463ba4f Merge pull request #15527 from grafana/15485-tab-in-url
fix: Remove tab param from url when leaving edit mode
2019-02-19 11:11:32 +01:00
Johannes Schill 8876d17dc0 chore: graph2 panel plugin should use the new ReactPanelPlugin from @grafana/ui 2019-02-19 11:00:23 +01:00
Leonard Gram 4df78fe7ac Update CHANGELOG.md 2019-02-19 10:47:57 +01:00
Leonard Gram a9748f460e Update CHANGELOG.md 2019-02-19 10:46:51 +01:00
Leonard Gram 99205d5d9a Update CHANGELOG.md 2019-02-19 10:40:54 +01:00
Johannes Schill 891b2ca1a2 fix: Have the tab param removed from the url when leaving edit mode #15485 2019-02-19 09:43:35 +01:00
Torkel Ödegaard 14d8a94273 Merge pull request #15521 from grafana/hugoh/bug-type-error-in-thresholds
Fixes #15505
2019-02-19 09:07:01 +01:00
Torkel Ödegaard 104e656bd1 Merge pull request #15514 from grafana/fixed-navbar-edit-padding
Fixed navbar backbutton padding
2019-02-19 09:06:32 +01:00
bergquist 7754c37a1f reduce loglevel to debug 2019-02-19 08:22:33 +01:00
Hugo Häggmark 7f04848dea Fixes #15505 2019-02-19 07:48:54 +01:00
Marcus Efraimsson 56136a5396 fix native annotation filtered by template variable with pipe 2019-02-18 22:54:45 +01:00
Torkel Ödegaard 13e27601df Fixed navbar backbutton padding 2019-02-18 21:29:42 +01:00
Torkel Ödegaard 1eb804c655 Merge pull request #15411 from grafana/theme-files-cleanup
[wip]Cleaning up the theme .scss files
2019-02-18 20:23:40 +01:00
Torkel Ödegaard 9d78960c5e Merge pull request #15503 from grafana/explore-icon
Updated explore icon and style tweaks
2019-02-18 18:37:51 +01:00
Torkel Ödegaard caa477591b Merge pull request #15504 from grafana/thresholds-sort-order
Fixing array direction, adding simple render test
2019-02-18 18:35:11 +01:00
Torkel Ödegaard df170aee16 Updated explore icon and style tweaks
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
2019-02-18 18:26:24 +01:00
Dominik Prokop 1069d7f5b1 Display graphite function name editor in a tooltip 2019-02-18 17:55:38 +01:00
corpglory-dev 54db887cca Merge branch 'master' into piechart-react 2019-02-18 19:40:00 +03:00
Leonard Gram 3d994b16d0 Update CHANGELOG.md 2019-02-18 16:58:15 +01:00
Leonard Gram 9738ba82e4 Update CHANGELOG.md 2019-02-18 16:54:46 +01:00
Peter Holmberg 93e8edfddd Fixing array direction, adding simple render test, fixes #15478
Fixed unit test and updated gauge
Added migration for threshold order
2019-02-18 16:46:32 +01:00
Leonard Gram 71e74181ab Update CHANGELOG.md 2019-02-18 16:38:29 +01:00
David 5e8570f822 Merge pull request #15491 from grafana/davkal/15436-loki-docs
Datasource docs for Loki
2019-02-18 16:20:40 +01:00
Daniel Lee 9ebbdbeb4b changelog: adds note for #15500 2019-02-18 15:59:37 +01:00
Daniel Lee 600bbf7e21 Merge pull request #15502 from grafana/15500-cli
cli: chmod 755 for backend plugin binaries
2019-02-18 15:53:43 +01:00
Torkel Ödegaard e5562305e3 fixed page-header-bg 2019-02-18 15:35:27 +01:00
Torkel Ödegaard 2afd3cf5aa Merge pull request #15499 from grafana/hugoh/bug-thresholds-and-infinity
Fixes #15477
2019-02-18 15:07:24 +01:00
Daniel Lee 56c965e5df cli: chmod 755 for backend plugin binaries
Fixes #15500. Does a simple filename check if the binary names ends
with _linux_amd64 or _darwin_amd64 then sets the file mode to 755.
2019-02-18 15:05:34 +01:00
ijin08 c62f06b427 reversed most of grays in dark theme 2019-02-18 14:35:13 +01:00
Hugo Häggmark 92972eed7b Fixes #15477 2019-02-18 13:56:48 +01:00
Torkel Ödegaard 730515d8dc Merge pull request #15483 from klaernie/patch-1
Add Lux to units
2019-02-18 12:52:42 +01:00
Torkel Ödegaard 35253cb7f7 Merge pull request #15498 from grafana/fix/15463
Remove maxDataPoints and interval props from props to remember in panel model
2019-02-18 12:37:07 +01:00
Torkel Ödegaard 26d02180e5 Merge branch 'bar-gauge-poc' of github.com:grafana/grafana into bar-gauge-poc 2019-02-18 12:01:15 +01:00
Torkel Ödegaard 711e4e926b Merge branch 'master' into bar-gauge-poc 2019-02-18 11:55:37 +01:00
Torkel Ödegaard abddb442a1 Changed how react panels store their options (#15468)
Changed how react panels store their options

* Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future
* Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb
* Also remove nested options prop that was there due to bug
* Added missing Gauge props
* Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals
* Fixed unit tests
* More fixes for react panels
2019-02-18 11:41:14 +01:00
Torkel Ödegaard a6cae5b2b8 Merge pull request #15494 from grafana/minor-tweaks-panel-edit
Removed primary class from Add Query button, and changed name of panel options tab
2019-02-18 11:36:19 +01:00
Dominik Prokop 8e035676e1 Remove maxDataPoints and interval props from props to remember in panel model 2019-02-18 11:33:16 +01:00
Torkel Ödegaard 7db7a69917 Merge pull request #15496 from grafana/fix/typo
Fix typo in view mode cycle button
2019-02-18 11:32:22 +01:00
Dominik Prokop 75dd7d0036 Fix typo in view mode cykle button 2019-02-18 11:08:42 +01:00
Dominik Prokop 4721250d19 Variables regenerated 2019-02-18 11:05:02 +01:00
Dominik Prokop 6da57d4c08 Make clear that variable scss files are generated from templates 2019-02-18 11:03:52 +01:00
Torkel Ödegaard 14ba3f5891 Fixed spelling issue in templating docs 2019-02-18 10:59:22 +01:00
Torkel Ödegaard bf826d7c81 Removed primary class from Add Query button, and changed name of Panel Options tab o General Options 2019-02-18 10:49:14 +01:00
Torkel Ödegaard 9e55fef544 improved formatting of variable docs 2019-02-18 09:52:31 +01:00
David Kaltschmidt 815affe02d Datasource docs for Loki
- adds Loki data source docs to Grafana docs
- moved query-related docs from Explore to Loki
2019-02-18 09:39:44 +01:00
Torkel Ödegaard d285da35de Merge pull request #15487 from brunorey/master
Added enable_gzip documentation (#15322)
2019-02-18 09:30:52 +01:00
Dominik Prokop 28f42bab5b Replace require with import in start task 2019-02-18 09:26:14 +01:00
Torkel Ödegaard db21551db2 Merge pull request #15481 from grafana/react-panel-header-issue
Fixed issue with PanelHeader and grid-drag-handle in fullscreen
2019-02-18 09:14:03 +01:00
Bruno b488892f5f Added enable_gzip documentation (#15322) 2019-02-17 17:38:56 -03:00
Andre Klärner 4d555aceaa Add Lux to units
fixes #15479
2019-02-17 13:30:41 +01:00
Torkel Ödegaard 89ad525986 Fixed issue with PanelHeader and grid-drag-handle class still being applied in fullscreen, fixes #15480 2019-02-17 08:11:57 +01:00
Torkel Ödegaard dede40d459 Began work on handling panel type switching and keep setting 2019-02-17 07:03:42 +01:00
Torkel Ödegaard 1d4dae7aa8 Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:34:56 +01:00
Torkel Ödegaard 22b7864d72 Fixed unit tests 2019-02-16 16:33:29 +01:00
Torkel Ödegaard d33d08fa15 Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals 2019-02-16 16:27:12 +01:00
Torkel Ödegaard c0b204f93b Added missing Gauge props 2019-02-16 16:06:16 +01:00
Torkel Ödegaard 42d90fdb7a Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:02:31 +01:00
Torkel Ödegaard 3dae915b23 Bar gauge icon updated 2019-02-16 15:47:35 +01:00
Torkel Ödegaard c05c3df52f Added bar gauge icon 2019-02-16 15:47:35 +01:00
Torkel Ödegaard d31cf45cb5 Began work on adding options 2019-02-16 15:47:34 +01:00
Torkel Ödegaard 2a83d8ab95 Added basic tests 2019-02-16 15:47:34 +01:00
Torkel Ödegaard eaedcee8de bar-gauge storybook 2019-02-16 15:47:33 +01:00
Torkel Ödegaard 83d1eb87e5 Began experimenting with a bar gauge 2019-02-16 15:47:33 +01:00
Torkel Ödegaard 4c59a91651 Also remove nested options prop that was there due to bug 2019-02-16 15:46:30 +01:00
Torkel Ödegaard 43e0ad3f93 Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb 2019-02-16 15:46:30 +01:00
Torkel Ödegaard 074073787d Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future 2019-02-16 15:46:30 +01:00
Torkel Ödegaard 9035ce4d18 Changed how react panels store their options 2019-02-16 15:46:29 +01:00
Torkel Ödegaard 2d5fd7fdfd Fixed prettier issue (#15471)
Fixed prettier CI issue that caused build failures
2019-02-16 15:45:19 +01:00
corpglory-dev 8b4eefa768 Initial commit 2019-02-15 20:43:51 +03:00
Torkel Ödegaard 8bde9de507 Added bar gauge icon 2019-02-15 18:29:21 +01:00
Torkel Ödegaard d611f9a4f5 Began work on adding options 2019-02-15 17:33:31 +01:00
Torkel Ödegaard b05f1d8e63 Added basic tests 2019-02-15 17:02:02 +01:00
Torkel Ödegaard 1adc1a6097 Merge pull request #15455 from grafana/fixed-handling-of-alert-urls
Fixed handling of alert urls with true flags
2019-02-15 16:27:23 +01:00
bergquist c68da40710 run db tests in all packages 2019-02-15 16:26:24 +01:00
Torkel Ödegaard b34f2665fd bar-gauge storybook 2019-02-15 15:23:16 +01:00
ijin08 794fb3e039 new dark-3 became new dark-2, created new lighter dark-3, changed panel-bg, empty-cta etc to dark-2 2019-02-15 14:02:46 +01:00
Torkel Ödegaard 4c28ec83b3 Merge pull request #15444 from max-neverov/percent_diff_null
Fix percent_diff calculation when points are nulls
2019-02-15 13:03:19 +01:00
Marcus Efraimsson bc1aec9ea6 Merge pull request #15427 from grafana/15308_docs
Improved documentation of new short-lived token solution
2019-02-15 13:00:28 +01:00
Torkel Ödegaard 843f8b04d4 Began experimenting with a bar gauge 2019-02-15 12:55:35 +01:00
Marcus Efraimsson ff87f6d303 docs: suggested changes 2019-02-15 11:31:29 +01:00
Torkel Ödegaard 3d3db08b56 Merge pull request #15452 from grafana/grafana-ui-type-fixes
Added missing strict type checking options to grafana/ui
2019-02-15 11:28:23 +01:00
Torkel Ödegaard a7674336ca Merge pull request #15453 from grafana/dashboard-navbar-buttons
Fixed dashboard navbar buttons being visible in fullscreen
2019-02-15 11:27:25 +01:00
Marcus Efraimsson 88fbe3adca docs: fix header 2019-02-15 11:27:21 +01:00
Torkel Ödegaard 7699706e65 fixed handling of alert urls with true flags, fixes #15454 2019-02-15 11:23:31 +01:00
Torkel Ödegaard 7b59b9cf4b Fixed dashboard navbar buttons being visible in fullscreen, fixes #15450 2019-02-15 11:03:24 +01:00
Torkel Ödegaard d6de40cbe6 Added missing strict type checking options to grafana/ui and fixed type errors 2019-02-15 10:49:10 +01:00
Maxim Neverov 28eaac3a9c Extracted common code for diff calculation 2019-02-14 21:52:59 +01:00
bergquist af5a2468e8 fix spelling error 2019-02-14 20:18:24 +01:00
bergquist 191f9c8407 whats new: rename security section 2019-02-14 19:42:39 +01:00
Torkel Ödegaard 0256a4dd47 Merge pull request #15417 from kiran3394/master
added support for influxdb non_negative_difference function in tsdb
2019-02-14 18:49:32 +01:00
Torkel Ödegaard 7fd89ff77a Merge pull request #15424 from grafana/move-error-boundry
Move error boundry from DataPanel to PanelChrome
2019-02-14 18:27:03 +01:00
David 2c92365969 Merge pull request #15305 from avaly/feature/ansi-colors
Support ANSI colors codes in Loki logs
2019-02-14 18:01:23 +01:00
Torkel Ödegaard cd8f5835ec Merge pull request #15395 from briangann/20190212_adjust_notifier_render_timeout
allow 90 percent of alertTimeout for rendering to complete vs 50 percent
2019-02-14 17:21:40 +01:00
Maxim Neverov 3c2f6094b2 Fix percent_diff calculation when points are nulls 2019-02-14 16:31:15 +01:00
Carl Bergquist 0b13c96c83 Merge pull request #15419 from bergquist/contributing_bug_fixes
contributing: improve guide for bug fixes
2019-02-14 16:22:58 +01:00
Torkel Ödegaard 19a080a4d4 Restored loading spinner to DataPanel 2019-02-14 15:29:36 +01:00
bergquist 72f522bb51 rearrange bullet points in PR template
[skip ci]
2019-02-14 15:24:52 +01:00
Torkel Ödegaard 79008a7acd added another error message scenario 2019-02-14 15:23:34 +01:00
bergquist b37e05714c link to contributing guidelines in pr template 2019-02-14 15:22:13 +01:00
Torkel Ödegaard 2bc26a01f9 Fixes to error handling and clearing, also publishing of legacy events so old query editors work with react panels fully 2019-02-14 15:18:55 +01:00
bergquist 3f714fbd1b contributing: adds link to help wanted label 2019-02-14 14:54:09 +01:00
bergquist 681269b3fe contributing: adds link to our CLA 2019-02-14 14:53:46 +01:00
bergquist e22cba67dc removes testing instruction from contributing doc 2019-02-14 14:26:25 +01:00
bergquist 94c1335f11 docs: move alerting above session 2019-02-14 14:17:02 +01:00
bergquist 933d4729db docs: mention samesite setting 2019-02-14 14:06:50 +01:00
ijin08 3b3a5b6797 increased blue in dark-1-5, dark-3 and dark-4 2019-02-14 13:32:45 +01:00
bergquist 7f7cc85ef0 docs: adds note about new login cookie name 2019-02-14 13:24:41 +01:00
Torkel Ödegaard cc61d9c5cc Merge branch 'master' into move-error-boundry 2019-02-14 13:10:49 +01:00
ijin08 a405be4415 Merge branch 'theme-files-cleanup' of github.com:grafana/grafana into theme-files-cleanup 2019-02-14 11:48:33 +01:00
ijin08 cbb91adb43 changed color for blue light in light theme + small changes in naming etc 2019-02-14 11:47:17 +01:00
Johannes Schill 3ca4adf51e Add missing nodemon dependency 2019-02-14 11:24:34 +01:00
Carl Bergquist 4f3b9c6c37 Merge pull request #15420 from marefr/fix_generic_oauth_doc
docs: add availability note regarding non-compliant providers
2019-02-14 10:17:58 +01:00
Marcus Efraimsson 0cbf7aaf25 Merge pull request #15412 from marefr/ha_loki
devenv: loki support in ha test
2019-02-14 10:15:51 +01:00
bergquist 982f262089 make bug/feature titles more verbose 2019-02-14 09:13:58 +01:00
bergquist 0e6800495f mentioned closes/fixes for new features 2019-02-14 09:02:51 +01:00
Marcus Efraimsson de2f3db413 docs: improve removal of session storage for what's new in v6.0 2019-02-13 19:54:45 +01:00
Marcus Efraimsson 1bd9573f8e docs: add upgrade notes for v6.0 2019-02-13 19:53:55 +01:00
Marcus Efraimsson 592f57d0ba docs: add note regarding auth proxy and user session requirement 2019-02-13 19:53:25 +01:00
Marcus Efraimsson 3fab4d6f8c docs: fix typo 2019-02-13 19:52:27 +01:00
ijin08 6160f36121 removed more unused variables, restyled scrollbar 2019-02-13 18:04:53 +01:00
Torkel Ödegaard 4c9dba9152 Merge pull request #15423 from grafana/fixed-react-panels-dimensions
Fixed issue with react panel dimensions
2019-02-13 17:17:19 +01:00
Brian Gann c98b00c302 allow 90 percent of alertTimeout for rendering to complete vs 50 percent 2019-02-13 09:56:37 -06:00
Peter Holmberg 0c72fb3be1 Merge branch 'master' into move-error-boundry 2019-02-13 16:52:52 +01:00
Torkel Ödegaard ef9e74fabb Fixed issue with sass variables used from typescript, the prettier lowercases export variables 2019-02-13 16:36:59 +01:00
Peter Holmberg aad558ce9c using error callback from datapanel instead 2019-02-13 15:54:10 +01:00
Patrick O'Carroll 65b4273551 Merge branch 'master' into theme-files-cleanup 2019-02-13 15:46:59 +01:00
Marcus Efraimsson 3b0159bf84 docs: add availability note regarding non-compliant providers
ref #15408
2019-02-13 15:36:16 +01:00
Torkel Ödegaard c243e78913 Merge pull request #15399 from grafana/15330-vizpicker-red-when-0-hits
Red border color on input when zero hits in vizpicker
2019-02-13 15:22:00 +01:00
Torkel Ödegaard 61de0a7330 Merge pull request #15418 from grafana/change-default-devenv-datasource
Changed devenv default data source to testdata
2019-02-13 15:04:51 +01:00
Dominik Prokop d3b90d5b78 Fixed sass vars template files 2019-02-13 14:58:27 +01:00
Dominik Prokop 4366b1588e Added deprecation warning to npm watch script - use start script instead 2019-02-13 14:58:01 +01:00
ijin08 7a4508d11e added new dark variable to dark theme(the color used for page-bg), changed some backgroud colors that doesn't use variables to use variables, made some slight tweaks to dark variables, fixed so item hover is the same as card hover 2019-02-13 14:56:28 +01:00
Torkel Ödegaard 124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Dominik Prokop a09250a309 Simple CLI for running grafana in dev env 2019-02-13 14:47:59 +01:00
Dominik Prokop 06bae9aa46 Added common theme variabless generation, created GrafanaThemeCommons interface 2019-02-13 14:45:11 +01:00
bergquist 058debee67 contributing: improve guide for bug fixes 2019-02-13 14:25:26 +01:00
Torkel Ödegaard 0ed32ebcb4 Changed devenv default data source to testdata 2019-02-13 14:09:04 +01:00
z0029c4 13974cdd28 added support for influxdb non_negative_difference function in tsdb 2019-02-13 18:12:35 +05:30
z0029c4 8cb1e5b918 added support for influxdb non_negative_difference function in tsdb for alerting 2019-02-13 17:55:31 +05:30
Dominik Prokop 4903b03d24 Remove precommit from npm scrips 2019-02-13 12:32:42 +01:00
Torkel Ödegaard adf87dc49f Merge pull request #15413 from grafana/prettier-on-all-again
Prettier fixes
2019-02-13 12:27:04 +01:00
Torkel Ödegaard ffdf747080 More files that has fixed with prettier 2019-02-13 11:39:41 +01:00
Torkel Ödegaard ac9129c2b7 Added prettierignore and check script 2019-02-13 11:38:04 +01:00
Marcus Efraimsson 0f758fd1ff devenv: use grafana:dev image in ha test per default 2019-02-13 11:18:29 +01:00
Marcus Efraimsson e61616d829 devenv: send nginx logs to loki in ha test 2019-02-13 11:18:29 +01:00
Marcus Efraimsson d55a6deb97 devenv: proper fluentd conf for grafana and loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson 7b1249ad47 devenv: use grafana/fluent-plugin-loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson 0f40b2d206 devenv: trying to make fluentd with inoffical fluent-plugin-loki work 2019-02-13 11:18:29 +01:00
Peter Holmberg 56f7cd9602 fixed issue with updatePopperPosition 2019-02-13 11:18:08 +01:00
Torkel Ödegaard cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
ijin08 09dbd6b1a6 removed _plugins.scss and _settings_permissions.scc, removed unused classes in _login.scss, reduced dark variabels in light theme and alignied light theme a bit with dark theme, turned blue-gray, dark-3 and panel-bg variables into one variable and removed gray-7 in dark theme 2019-02-13 11:04:22 +01:00
Johannes Schill 27bbadce1d feat: Add EmptySearchResult ui component and use it in VizTypePicker 2019-02-13 09:22:09 +01:00
Torkel Ödegaard 3b0ae4bd0a Merge pull request #15368 from grafana/15217-panels-without-queries
POC: Panels without queries can skip DataPanel
2019-02-13 08:06:25 +01:00
Torkel Ödegaard 6be50c952c Merge pull request #15400 from grafana/removed-icons-in-buttons
Removed some icons in action button
2019-02-13 08:05:11 +01:00
Johannes Schill b6305c2d80 Revert "feat: Add css-support for invalid form input elements"
This reverts commit b1aa84804b.
2019-02-13 07:46:21 +01:00
Johannes Schill 44eaa3eaa8 Revert "feat: Highlight vizpicker input when there are no panels matching the search query"
This reverts commit 11db48e76e.
2019-02-13 07:46:14 +01:00
Dominik Prokop 2542a43ec0 Regenerating variabless sas on theme edit v1 2019-02-12 21:54:20 +01:00
Torkel Ödegaard 88ef2e1d32 Fixed a minor plugin json lingering issue 2019-02-12 18:31:35 +01:00
Torkel Ödegaard 960fa56033 Merge pull request #15382 from grafana/hugoh/bug-pressing-brackets-key-in-input-fields
Bug pressing special regexp chars in input fields
2019-02-12 17:55:42 +01:00
Torkel Ödegaard f195459b01 Removed some icons in action button
Trying to align some title case issues
2019-02-12 17:51:08 +01:00
Dominik Prokop 0a66d8afc7 Merge branch 'master' into cli/watch-sass-var 2019-02-12 17:20:14 +01:00
Peter Holmberg 1c5118748a implement show error in panelcorner 2019-02-12 17:01:07 +01:00
Hugo Häggmark 90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark 222482b6be Forgot about the snapshots 2019-02-12 16:31:11 +01:00
Torkel Ödegaard c839034f45 Merge branch '15217-panels-without-queries' of github.com:grafana/grafana into 15217-panels-without-queries 2019-02-12 16:30:41 +01:00
Torkel Ödegaard ef7236439a Merge pull request #15391 from grafana/fixed-double-datasource-edit-page
Fixed issues with double page body and husky pre-commit hook
2019-02-12 16:28:07 +01:00
Hugo Häggmark 4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Johannes Schill 11db48e76e feat: Highlight vizpicker input when there are no panels matching the search query 2019-02-12 16:19:23 +01:00
Torkel Ödegaard 5708660893 Updated a few plugin json files with dataFormats 2019-02-12 16:15:05 +01:00
Johannes Schill b1aa84804b feat: Add css-support for invalid form input elements 2019-02-12 16:14:48 +01:00
Peter Holmberg 9f88a22b4c remove comments 2019-02-12 16:14:26 +01:00
Peter Holmberg f52aa4de4e Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 16:13:15 +01:00
Peter Holmberg f0565684c7 Merge branch '15217-panels-without-queries' of https://github.com/grafana/grafana into 15217-panels-without-queries 2019-02-12 16:11:04 +01:00
Peter Holmberg 530a370379 bubble error from datapanel to panelchrome 2019-02-12 16:06:02 +01:00
Torkel Ödegaard a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Torkel Ödegaard bde9e9d5a5 Merge pull request #15394 from grafana/13066-save-as-dashboard
fix: No need to have edit permissions to be able to "Save as"
2019-02-12 15:57:41 +01:00
Carl Bergquist dcec61e1b4 Merge pull request #15378 from grafana/auth_token_quotas
use authTokenService for session quotas restrictions
2019-02-12 15:38:57 +01:00
bergquist e163aadfe4 use authtoken for session quota restrictions
closes #15360
2019-02-12 15:10:55 +01:00
Torkel Ödegaard 8bd7e5a5f4 Merge pull request #15374 from grafana/explore/dedup-selector
Move deduplication calculation from Logs component to reselect selector
2019-02-12 14:57:06 +01:00
Torkel Ödegaard 9772497354 Merge pull request #15389 from grafana/tooltip-error-theme-text-color
fix: Tooltip error text color
2019-02-12 14:43:51 +01:00
Torkel Ödegaard 2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Johannes Schill 335042b2d0 fix: No need to have edit permissions to be able to "Save as" a dashboard 2019-02-12 14:29:27 +01:00
Johannes Schill 2a655cb38a Revert "chore: wip: Replace brace with ace-builds to get latest version of ace"
This reverts commit c98b86fd6b58ac5f77c197d7551751e62d53bedd.
2019-02-12 12:41:19 +01:00
Johannes Schill 2d4e1a80bc chore: wip: Replace brace with ace-builds to get latest version of ace 2019-02-12 12:41:18 +01:00
Johannes Schill 49e0572611 fix: Error tooltip should have white text on red background. Not red text on red background 2019-02-12 12:41:18 +01:00
Dominik Prokop dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +01:00
bergquist 1310d356fc removes unused session code 2019-02-12 12:33:54 +01:00
Johannes Schill c3965e332d chore: Rename renderPanel to renderPanelBody 2019-02-12 12:28:53 +01:00
Johannes Schill d5918498da chore: Rename renderDataPanel to renderPanel 2019-02-12 12:28:53 +01:00
Johannes Schill 01208ccd68 chore: Rename renderHelper > renderDataPanel and move logic to smaller functions 2019-02-12 12:28:53 +01:00
Johannes Schill b5dbf26dc4 chore: PR feedback, shorten boolean check 2019-02-12 12:28:53 +01:00
Johannes Schill 075fb8e91c chore: Rename isDataPanel to noQueries 2019-02-12 12:28:53 +01:00
Johannes Schill b7b1a79405 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-12 12:28:53 +01:00
Johannes Schill d3115325a9 feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-12 12:28:53 +01:00
Johannes Schill 3f64d61fd2 feat: Add util to convert snapshotData to PanelData 2019-02-12 12:28:53 +01:00
Johannes Schill c4b2dcefbe feat: Introduce IsDataPanel attribute to plugin.json 2019-02-12 12:28:53 +01:00
Johannes Schill 0811fbd6d0 fix: Add missing typing 2019-02-12 12:28:52 +01:00
Torkel Ödegaard e5759fa0ed Merge pull request #15387 from grafana/hugoh/can-not-set-decimal-threshold-in-gauge
Fixes #15372 with number input and parseFloat
2019-02-12 12:22:09 +01:00
Hugo Häggmark da80286f97 Fixes #15372 with number input and parseFloat 2019-02-12 11:10:31 +01:00
Peter Holmberg 1db5d86b12 Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 10:54:55 +01:00
Peter Holmberg 7d0edb285d Revert "hard move"
This reverts commit a2dad6157a.
2019-02-12 10:53:05 +01:00
Johannes Schill be58e275a5 chore: PR feedback, shorten boolean check 2019-02-12 09:55:09 +01:00
Torkel Ödegaard bc8418adac Merge branch 'master' of github.com:grafana/grafana 2019-02-12 09:49:01 +01:00
Johannes Schill 2db9cb3d93 chore: Rename isDataPanel to noQueries 2019-02-12 09:48:46 +01:00
Torkel Ödegaard 38a74c6444 Merge pull request #15383 from bergquist/test_provisoned_ds
enable testing provsioned datasources
2019-02-12 09:48:36 +01:00
Hugo Häggmark 25dbca9585 Merge with master 2019-02-12 08:50:05 +01:00
Hugo Häggmark 130eedc4ae Found another input that was tied to a regexp 2019-02-12 08:48:54 +01:00
Hugo Häggmark 5388541fd7 Fixes bug #12972 with a new type of input that escapes and unescapes special regexp characters 2019-02-12 08:48:54 +01:00
bergquist 3b9105e1be enable testing provsioned datasources
closes #12164
2019-02-12 08:45:21 +01:00
Torkel Ödegaard 342aa0ad01 Merge branch 'master' of github.com:grafana/grafana 2019-02-12 08:22:28 +01:00
Torkel Ödegaard edd9576f15 Fixed elastic5 docker compose block 2019-02-12 08:04:30 +01:00
Torkel Ödegaard 1407691de2 Merge pull request #15377 from grafana/fix/named-colors-palette-default-colors
Fix error caused by named colors that are not part of named colors palette
2019-02-12 06:57:19 +01:00
Dominik Prokop a5d158c014 Added one more test case for color resolving helper 2019-02-11 21:22:53 +01:00
Dominik Prokop ed208f2b5f Fix error caused by named colors that are not part of named colors palette 2019-02-11 21:11:19 +01:00
Torkel Ödegaard b590c4da40 Merge pull request #15371 from grafana/react-panels-request-id-fix
Fixed issue with gauge requests being cancelled
2019-02-11 20:47:27 +01:00
Torkel Ödegaard fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +01:00
Torkel Ödegaard e38cfc1a71 Update package.json 2019-02-11 17:43:02 +01:00
Torkel Ödegaard 0493d905f1 Update CHANGELOG.md 2019-02-11 17:42:31 +01:00
Torkel Ödegaard a79bd42414 Merge pull request #15306 from grafana/explore/dedup-strategu-url
Persist deduplication strategy in url
2019-02-11 17:12:41 +01:00
Daniel Lee 951e5932d4 changelog: adds note for #15363 2019-02-11 17:00:16 +01:00
Dominik Prokop 1693f083cc Move deduplication calculation from Logs component to redux selector 2019-02-11 16:57:49 +01:00
Torkel Ödegaard e50b7b3279 Merge branch 'ui-new-red-green-blue' 2019-02-11 16:51:30 +01:00
Torkel Ödegaard 99df7b87c0 Merge branch 'master' of github.com:grafana/grafana 2019-02-11 16:51:24 +01:00
Torkel Ödegaard 6d11999e20 Merge pull request #15367 from grafana/gauge-max-value
Fix issue with Max value in Gauge
2019-02-11 16:50:42 +01:00
Torkel Ödegaard 5195954681 style tweak to alert 2019-02-11 16:50:12 +01:00
Daniel Lee 18615a3357 Merge pull request #15363 from bergquist/edition_to_build_info
adds edition to build_info metric
2019-02-11 16:46:53 +01:00
Torkel Ödegaard afc2efa56d Removed plus icons 2019-02-11 16:45:47 +01:00
Peter Holmberg a2dad6157a hard move 2019-02-11 16:44:09 +01:00
Torkel Ödegaard 8e93b68e6d restoring green CTA 2019-02-11 16:38:05 +01:00
Torkel Ödegaard b920ee0ea3 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 16:26:58 +01:00
Torkel Ödegaard b93cdf56fb Removed double page container 2019-02-11 16:26:02 +01:00
Johannes Schill 0019e0ffc9 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-11 16:21:54 +01:00
Peter Holmberg c332e106a2 Removing default thresholds values. 2019-02-11 16:00:08 +01:00
bergquist e4e42fcd08 adds edition to build_info metric 2019-02-11 15:42:12 +01:00
Torkel Ödegaard c4fa64e6dc Updated lint-staged 2019-02-11 15:23:50 +01:00
Daniel Lee 93f1a48641 changelog: adds note for #14623 2019-02-11 15:21:02 +01:00
Torkel Ödegaard 4408817e65 Fixed double page class on api keys and org details page 2019-02-11 15:18:11 +01:00
Daniel Lee 1c364b57b5 Merge pull request #15353 from grafana/14623-azure-monitor-alerting
Adds alerting for the Azure Monitor API in the Azure Monitor datasource
2019-02-11 15:16:32 +01:00
Torkel Ödegaard 931bece16e Merge branch 'master' into ui-new-red-green-blue 2019-02-11 15:00:00 +01:00
Torkel Ödegaard 962815169e Color tweaks 2019-02-11 14:58:11 +01:00
Daniel Lee ac345312a4 azuremonitor: don't use make for maps and array 2019-02-11 14:42:12 +01:00
ijin08 56b35354c7 changed back to old green in light theme 2019-02-11 14:21:43 +01:00
Daniel Lee 52fe6b0316 Merge pull request #15198 from CorpGlory/azure-monitor-refactor-#15087
Azure Monitor: refactor #15087
2019-02-11 14:19:42 +01:00
Marcus Efraimsson 8769b7aa57 changelog: add notes about closing #15258 2019-02-11 14:17:59 +01:00
Marcus Efraimsson 757a98257d changelog: add notes about closing #15223 2019-02-11 14:17:59 +01:00
Marcus Efraimsson 1f0c7727f4 changelog: add notes about closing #15222 2019-02-11 14:17:59 +01:00
Marcus Efraimsson 63f465f0ac changelog: add notes about closing #15122 2019-02-11 14:17:59 +01:00
Marcus Efraimsson 9472d7e600 changelog: add notes about closing #15219 2019-02-11 14:17:59 +01:00
Marcus Efraimsson a7c44c2ce7 changelog: add notes about closing #14432 2019-02-11 14:17:59 +01:00
Marcus Efraimsson 82e330a1c5 update changelog 2019-02-11 14:17:32 +01:00
Daniel Lee e53f41e511 changelog: adds note for #15131 2019-02-11 14:10:01 +01:00
Daniel Lee 22d64a8c2a Merge pull request #15301 from grafana/azure-monitor-autocomplete
Azure Monitor: improve autocomplete for Log Analytics and App Insights editor
2019-02-11 14:06:43 +01:00
Marcus Efraimsson c13e302cde Merge pull request #15356 from grafana/15258_fix
revert ds_proxy timeout and implement dataproxy timeout correctly
2019-02-11 14:05:51 +01:00
Marcus Efraimsson 5e6c746c9b changelog: add notes about closing #15284 2019-02-11 13:58:36 +01:00
Torkel Ödegaard 77ba734491 Fixed issue with light theme introduced by #15333 2019-02-11 13:54:50 +01:00
Peter Holmberg c7bb563cef devenv test dashboard 2019-02-11 13:43:58 +01:00
Torkel Ödegaard c92cd73bd8 Merge pull request #15355 from grafana/15284_fix_time_range
WIP: Datasources with custom time range handling should always take dashboard timezone into consideration
2019-02-11 13:43:47 +01:00
Torkel Ödegaard 9570394c49 minor style update 2019-02-11 13:42:37 +01:00
Marcus Efraimsson a1cd550df4 revert ds_proxy timeout and implement dataproxy timeout correctly 2019-02-11 13:42:05 +01:00
bergquist 13f21fffc4 changelog: adds note about closing #15295
[skip ci]
2019-02-11 13:35:37 +01:00
Carl Bergquist 1f7a1f807e Merge pull request #15299 from grafana/15295_fux
Make sure alert notifier provisioning directory are created for deb and rpm packages
2019-02-11 13:31:51 +01:00
Daniel Lee 0b74860f55 azuremonitor: fix auto interval calculation on backend
Not needed for alerting (as the query intervalms will always be 0) but needed
later when being called from the frontend)
2019-02-11 13:27:08 +01:00
Torkel Ödegaard b14958edef Minor style fixes 2019-02-11 13:24:02 +01:00
Dominik Prokop 85780eb30c Remove not related code 2019-02-11 13:18:16 +01:00
Marcus Efraimsson b9c36e5301 make sure opentsdb takes dashboard timezone into consideration 2019-02-11 13:13:38 +01:00
Marcus Efraimsson 519dfd0899 make sure influx takes dashboard timezone into consideration 2019-02-11 13:11:56 +01:00
Torkel Ödegaard a4dd63e224 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 13:04:25 +01:00
Dominik Prokop cee2e4788b Do not read store state from toggle panelaction creator 2019-02-11 12:56:37 +01:00
Carl Bergquist 1b22ceabbe Merge pull request #15347 from bergquist/usage_stats_naming
renames usage state metric for auth_token
2019-02-11 12:52:04 +01:00
Torkel Ödegaard 6f16f70456 Merge pull request #15354 from grafana/fix/plugin-loading-failure
Fix plugin loading failure message not being displayed
2019-02-11 12:49:08 +01:00
Torkel Ödegaard eff82abadd Merge branch 'gauge-multi-series' of github.com:grafana/grafana into gauge-multi-series 2019-02-11 12:04:39 +01:00
Marcus Efraimsson 37a73b6b35 make sure graphite takes dashboard timezone into consideration 2019-02-11 12:04:27 +01:00
Torkel Ödegaard 7e4225c08a Merge branch 'master' of github.com:grafana/grafana into gauge-multi-series 2019-02-11 12:04:05 +01:00
Dominik Prokop 14bf960b64 Merge branch 'master' into explore/dedup-strategu-url 2019-02-11 12:03:45 +01:00
Dominik Prokop c9fbd43231 Review changes 2019-02-11 11:59:48 +01:00
Peter Holmberg e0adc8fa30 Merge branch 'gauge-multi-series' of https://github.com/grafana/grafana into gauge-multi-series 2019-02-11 11:52:14 +01:00
Torkel Ödegaard ba2f698b81 Merge pull request #15352 from grafana/fixed-missing-graph-time-axis
Fixed missing time axis on graph due to width not being passed
2019-02-11 11:50:04 +01:00
Peter Holmberg 55b4162e85 return series label if selected stat is name 2019-02-11 11:47:51 +01:00
Dominik Prokop 9485c67827 Fix plugin loading failure message not being displayed 2019-02-11 11:47:12 +01:00
Torkel Ödegaard 2284175638 Merge branch 'master' into gauge-multi-series 2019-02-11 11:45:02 +01:00
Torkel Ödegaard d970c3a686 Merge pull request #15350 from grafana/fix/clear-search-on-vizpicker-close
Clear visualization picker search on picker close
2019-02-11 11:39:07 +01:00
Torkel Ödegaard 5af1bd657f Merge pull request #15351 from grafana/15270_fix
Fix navigate to folder with only uid
2019-02-11 11:38:48 +01:00
bergquist 5dc864b47f fixes invalid folder check
-f check if a file exists. -d checks if the dir exists
2019-02-11 11:36:34 +01:00
bergquist 7ce18ec4f7 extract notifiers folder creation to new if statement 2019-02-11 11:30:41 +01:00
Daniel Lee a54484638d interval: make the FormatDuration function public
A useful function that was ported from kbn.ts and can be used
to convert milliseconds into a kbn unit
2019-02-11 11:25:51 +01:00
Torkel Ödegaard b780b6377a Fixed missing time axis on graph due to width not being passed 2019-02-11 11:17:23 +01:00
bergquist 217eb6310e make sure notifiers dir exists for provisioning in docker 2019-02-11 11:17:23 +01:00
Torkel Ödegaard 8f6ccce16f Merge pull request #15346 from grafana/logs-graph-series-names
Fix for logs graph series names (level names)
2019-02-11 11:13:37 +01:00
Marcus Efraimsson f73f0e69e0 should be able to navigate to folder with only uid 2019-02-11 11:11:21 +01:00
bergquist 3ce99bca66 renames usage state name for auth token
as noted, sessions might not be a good name for this metrics.
while devices would be a better name for users I think we should
align the name with the code as much as possible. The ui listing
all auth_tokens per user should probarbly say "devices" instead
2019-02-11 11:08:31 +01:00
Dominik Prokop f39fef2a02 Clear visualization picker search on picker close 2019-02-11 11:03:24 +01:00
Torkel Ödegaard 784d4fb70d Update README.md 2019-02-11 10:57:32 +01:00
bergquist 2c8c4729a8 changelog: adds note about closing #15288 2019-02-11 10:47:03 +01:00
Dominik Prokop f80c8cc06c v1 2019-02-11 10:32:17 +01:00
Carl Bergquist 396a5a947f Merge pull request #15300 from bergquist/token_usage_stats
adds usage stats for sessions
2019-02-11 10:31:57 +01:00
Torkel Ödegaard a402a3713f Merge pull request #15339 from grafana/navbar-back-btn
Navbar back btn
2019-02-11 10:28:47 +01:00
ijin08 2a2b242eb0 removed extra semi-colon 2019-02-11 10:27:58 +01:00
Torkel Ödegaard e75e69a709 Commented out the Loki dashboard query editor 2019-02-11 10:27:04 +01:00
ijin08 1cff59731c added old green to dark-theme 2019-02-11 10:25:33 +01:00
Torkel Ödegaard 3bf0a5ffc6 Fixed issue with logs graph not showing level names 2019-02-11 10:01:43 +01:00
ijin08 9e0c795228 set secondary to new blue 2019-02-11 09:54:14 +01:00
Torkel Ödegaard 58e57a1669 removed unused directive 2019-02-11 09:46:56 +01:00
Torkel Ödegaard 9565e48f03 Fixed issue where double clicking on back button closes sidemenu 2019-02-11 09:37:13 +01:00
Patrick O'Carroll c34021344a Merge branch 'master' into ui-new-red-green-blue 2019-02-11 09:17:19 +01:00
Marcus Efraimsson 5eea85a3a3 changelog: add notes about closing #8570 2019-02-11 09:06:20 +01:00
Marcus Efraimsson 75f89ecf1f Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource
MySQL SSL CA in datasource connector
2019-02-11 09:00:18 +01:00
Marcus Efraimsson be11da5b31 update changelog 2019-02-11 08:49:10 +01:00
Marcus Efraimsson 06972144d2 changelog: add notes about closing #14233 2019-02-11 08:48:03 +01:00
Marcus Efraimsson 7b761f0a28 changelog: add notes about closing #15189 2019-02-11 08:44:04 +01:00
Marcus Efraimsson 41217ea110 changelog: add notes about closing #13324 2019-02-11 08:39:33 +01:00
Marcus Efraimsson bd48408e2d Merge pull request #15215 from thatsparesh/13324-mssql-pass-timerange-for-template-variable-queries
mssql: pass timerange for template variable queries
2019-02-11 08:36:47 +01:00
Daniel Lee d6904ba9b4 azuremonitor: small refactoring 2019-02-11 01:22:15 +01:00
Daniel Lee 60327953a2 azuremonitor: handles timegrain set to auto on backend 2019-02-11 01:17:37 +01:00
Torkel Ödegaard 9ab06c6eef Merge pull request #15333 from nrichards/nrichards-patch-1
Improve usability of forms, better showing disabled metrics
2019-02-10 20:15:53 +01:00
Torkel Ödegaard 3e583707ca Merge pull request #15335 from tcpatterson/cloudwatch-ec2-api-metrics
Add aws ec2 api metrics for cloudwatch
2019-02-10 20:15:12 +01:00
Torkel Ödegaard 295bc425ff Merge pull request #15337 from grafana/time-range-to-angular-query-controllers
provide time range to angular query controllers
2019-02-10 20:02:41 +01:00
Torkel Ödegaard f38e64cc5d Navbar back button, no title edit this time 2019-02-10 20:01:22 +01:00
Torkel Ödegaard a0729b9b50 provide time range to angular query controllers 2019-02-10 17:05:58 +01:00
Daniel Lee 452c4f5b9b azuremonitor: add test for dimension filter 2019-02-10 01:47:38 +01:00
Daniel Lee b94de101cd azuremonitor: refactor azure monitor api code into own file 2019-02-10 01:18:16 +01:00
Daniel Lee b816f35c41 azuremonitor: handle multi-dimensions on backend 2019-02-10 00:23:12 +01:00
thatsparesh 105879ab5d use timeSrv in metricFindQuery as timeRange 2019-02-09 14:57:20 -06:00
thatsparesh 716db35fae remove unnecessary spy 2019-02-09 14:56:43 -06:00
Daniel Lee a5e5db20e1 azuremonitor: add support for aggregations on backend 2019-02-09 21:52:44 +01:00
Connor Patterson d2aed7e075 Fix formatting 2019-02-09 14:13:15 -05:00
Connor Patterson 2987a47a9b Add aws ec2 api metrics for cloudwatch 2019-02-09 13:47:08 -05:00
Nick Richards bd6cefa53f Improve usability showing disabled lines in forms
* Use gray-3 instead of gray-2 for text-color-weak in "light" theme
2019-02-08 14:51:50 -08:00
Torkel Ödegaard 89c153d44b Merge pull request #15332 from grafana/style-fixes
Fixed issues with plus button in threshold and panel option header
2019-02-08 22:21:03 +01:00
Torkel Ödegaard 2e050d3337 Merge pull request #15331 from ryantxu/color-parsing
support three letter hex color strings
2019-02-08 22:19:56 +01:00
Torkel Ödegaard 748cb44911 Fixed issues with plus button in threshold and panel option header, and current state in viz picker, fixes #15329 2019-02-08 21:53:51 +01:00
ryan 169732997d support three letter hex color strings 2019-02-08 12:46:30 -08:00
Daniel Lee 10194df112 azuremonitor: simple alerting for Azure Monitor API
Lots of edge cases and functionality left to implement but
a simple query works for alerting now.
2019-02-08 18:15:17 +01:00
Torkel Ödegaard db8c74c4c3 Merge pull request #15323 from ryantxu/package-license
mark grafana-ui package with Apache license
2019-02-08 18:13:41 +01:00
Marcus Efraimsson 1bc2a0af70 use unique datasource id when registering mysql tls config 2019-02-08 18:08:07 +01:00
Daniel Lee 0e228d582d azuremonitor: builds a query and sends it to Azure on the backend
Lots of edge cases not covered and the response is not parsed. It only
handles one service and will have to be refactored to handle multiple
2019-02-08 17:20:31 +01:00
ryan 3d5ae3dca3 mark packages as Apache license 2019-02-08 08:10:02 -08:00
Torkel Ödegaard 3e317b7d20 Merge pull request #15235 from grafana/core/theming
POC - Enable js defined theme to be used in SASS
2019-02-08 16:10:17 +01:00
Torkel Ödegaard 5436c28448 Minor refactoring around theme access 2019-02-08 15:38:45 +01:00
Dominik Prokop 7e03913d0d Use TS instead of JS to store theme variables@next 2019-02-08 14:06:53 +01:00
Dominik Prokop 71576a634e Do not use js theme variables in sass (poor dev experience for now) 2019-02-08 14:06:06 +01:00
Dominik Prokop 512aa62efc Update config mock in metrics panel controller test 2019-02-08 11:50:05 +01:00
Torkel Ödegaard bb8bec5aaa Merge branch 'master' into core/theming 2019-02-08 09:05:41 +01:00
Leonard Gram b32d420a75 ldap: refactoring. 2019-02-08 08:18:24 +01:00
Daniel Lee 21a1507c77 ldap: fixes #14432. Fix for IPA v4.6.4
IPA v4.6.4 introduced a fix that does not allow empty attributes
to be sent in a search request. This fix only adds attributes to
the request if they are mapped in the ldap toml file.
2019-02-08 08:18:24 +01:00
Daniel Lee 13d9acb1ef ldap: adds docker block for freeipa 2019-02-08 08:18:24 +01:00
Johannes Schill ec02ddd27b feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-07 21:34:50 +01:00
Johannes Schill 8d4caa593e feat: Add util to convert snapshotData to PanelData 2019-02-07 21:31:05 +01:00
Johannes Schill a8a9bca07b feat: Introduce IsDataPanel attribute to plugin.json 2019-02-07 21:26:23 +01:00
Johannes Schill 8d9c347cb1 fix: Add missing typing 2019-02-07 21:23:56 +01:00
Torkel Ödegaard 0bd39e5426 Merge pull request #15307 from grafana/fixed-explore-width-0
fixed explore width-0 issue
2019-02-07 19:11:02 +01:00
Torkel Ödegaard 0f96cf8662 slight tweaks 2019-02-07 19:06:51 +01:00
Torkel Ödegaard df17f7dc45 fixed explore width-0 issue, fixes #15304 2019-02-07 18:20:16 +01:00
Dominik Prokop 229d646bfc Persis deduplication strategy in url 2019-02-07 18:01:09 +01:00
Valentin Agachi ec0e03e547 Support ANSI colors codes in Loki logs
Closes #15114
2019-02-08 00:49:39 +08:00
bergquist 2be60887ca adds usage stats for sessions 2019-02-07 16:27:40 +01:00
Torkel Ödegaard e080983147 Panel edit navbar poc 2019-02-07 16:14:11 +01:00
Marcus Efraimsson 9c18aa8684 make sure to create provisioning/notifiers directory for deb and rpm packages 2019-02-07 16:10:39 +01:00
Marcus Efraimsson b4267eafb8 log root cause error when reading from provisioning directories 2019-02-07 15:46:57 +01:00
bergquist 6e7941d396 moves usage stats sender to new package 2019-02-07 14:59:50 +01:00
corpglory-dev 0cc9cbcb54 Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-07 16:59:49 +03:00
Marcus Efraimsson c71904e326 Merge pull request #15239 from grafana/auth_token_middleware_refactor
Auth token package and middleware refactoring
2019-02-07 14:24:23 +01:00
Torkel Ödegaard 78ea7ae783 Merge pull request #15212 from grafana/dashboard-react-page
Dashboard react page
2019-02-07 14:23:44 +01:00
Dominik Prokop ac50d2b31f Merge branch 'master' into core/theming 2019-02-07 14:20:53 +01:00
Marcus Efraimsson b545f51820 changelog: add notes about closing #15291 2019-02-07 14:18:20 +01:00
Torkel Ödegaard 8f0e9b674d Merge pull request #15282 from CorpGlory/unexpected-semver-comparison-behavior-#15280
Unexpected semver comparison behavior #15280
2019-02-07 14:17:48 +01:00
Dominik Prokop e7917ce4e0 Removed unnecessary code from ColorPicker and extended theme type 2019-02-07 14:10:56 +01:00
Dominik Prokop 5ba3b0aa2c Selecting theme variable variant helper function 2019-02-07 14:10:20 +01:00
Torkel Ödegaard 00a676ff86 Merge pull request #15292 from mtanda/template_json_format
support json format templating
2019-02-07 14:05:09 +01:00
Torkel Ödegaard 8c65430ea3 Merge pull request #15251 from grafana/14822-use-autosizer
Remove react-sizeme and use AutoSizer
2019-02-07 14:03:25 +01:00
Torkel Ödegaard 2eca4caa5d added reducers tests 2019-02-07 13:58:24 +01:00
Mitsuhiro Tanda 89d69a6f21 update docs 2019-02-07 20:16:20 +09:00
Torkel Ödegaard 61e9148eed added way to test action called from react component 2019-02-07 12:02:01 +01:00
Torkel Ödegaard 5f808ddf22 Added annother initDashboard test 2019-02-07 11:17:31 +01:00
bergquist 487e7b5ea6 removes cleanup setting from docs 2019-02-07 11:07:55 +01:00
bergquist 170783c292 make hourly cleanup the default behavior 2019-02-07 10:51:35 +01:00
Peter Holmberg d8f1e99249 fix single gauge 2019-02-07 09:33:22 +01:00
Peter Holmberg 58f04178a3 removed direction and series mode options, cleaned up the code somewhat 2019-02-07 09:20:17 +01:00
Torkel Ödegaard 8b080f0511 Simplified condition 2019-02-07 09:09:59 +01:00
Mitsuhiro Tanda 4bd94b8aba support json format templating 2019-02-07 14:07:41 +09:00
Mitsuhiro Tanda d46bf75293 support /api/v1/labels 2019-02-07 13:59:42 +09:00
Marcus Efraimsson 3555997f98 devenv: update ha test and load test
better ha setup for many mysql connections
prometheus now scrapes mysql metrics in ha setup
ha setup provisions mysql dashboard
adds configurable virtual users for load test run script
2019-02-06 22:33:48 +01:00
Marcus Efraimsson 1a140ee199 run token cleanup job when grafana starts, then each hour 2019-02-06 22:27:08 +01:00
Torkel Ödegaard 6caae9167e Merge pull request #15278 from grafana/15277-remove-unused-theme-variables
Removed unused theme variables
2019-02-06 21:58:30 +01:00
Torkel Ödegaard 7edc3fdd5c Added another error object message detection 2019-02-06 21:35:01 +01:00
Torkel Ödegaard baeec495a2 Fixed some remaining issues 2019-02-06 21:32:48 +01:00
Torkel Ödegaard 961695a61f Improved dashboard page test 2019-02-06 21:08:15 +01:00
Torkel Ödegaard a4841a72d9 Improved dashboard page test 2019-02-06 21:04:18 +01:00
Torkel Ödegaard dd0afd0a0b Big refactoring for dashboard init redux actions 2019-02-06 19:42:04 +01:00
corpglory-dev ee132c1091 Fix SemVersion.isGtOrEq 2019-02-06 19:59:28 +03:00
Torkel Ödegaard 8574dca081 making changes suggested in review and improving typings 2019-02-06 17:31:52 +01:00
Marcus Efraimsson 836501186f fix 2019-02-06 17:30:17 +01:00
Peter Holmberg 9d052beddb show timeseries label under gauge 2019-02-06 17:07:32 +01:00
Dominik Prokop dc6b27d123 Minor cleanup 2019-02-06 17:05:43 +01:00
Dominik Prokop 1e4c6b4b52 Added test for SASS variable retrieval function from JS definition 2019-02-06 17:05:22 +01:00
Dominik Prokop 7762d72ae3 Updated stories to use new theming 2019-02-06 17:03:42 +01:00
Marcus Efraimsson 8ae066ab5d move authtoken package into auth package 2019-02-06 17:02:57 +01:00
Peter Holmberg 632908ec40 vertical and horizontal, removed mode option 2019-02-06 16:56:33 +01:00
Marcus Efraimsson 8678620730 move UserToken and UserTokenService to models package 2019-02-06 16:55:12 +01:00
corpglory-dev 43b5eba8ee Add failing test 2019-02-06 18:33:24 +03:00
corpglory-dev eb879062f9 Rename version_test to version.test 2019-02-06 18:32:22 +03:00
Marcus Efraimsson a60124a88c change UserToken from interface to struct 2019-02-06 16:30:50 +01:00
ijin08 16e3c193ec replaced some hex values with variables 2019-02-06 16:19:56 +01:00
ijin08 0e7b420d6a some changes i forgot to save in first push in variables.dark 2019-02-06 15:51:36 +01:00
ijin08 3ef4d20f77 removed trailing whitespace 2019-02-06 15:47:03 +01:00
ijin08 27a1a9e8c5 removed unused theme variables, removed empty sections, aligned the order of sections in the files 2019-02-06 15:45:40 +01:00
Peter Holmberg 71cfcd58ba combine mode with avg value 2019-02-06 15:38:51 +01:00
Dominik Prokop 7eb2558fc5 Fix issue with graph legend color picker disapearing on color selection 2019-02-06 15:06:27 +01:00
Marcus Efraimsson 809d4b040a changelog: add notes about closing #12546 2019-02-06 14:52:17 +01:00
Marcus Efraimsson afa87e6ab4 Merge pull request #15197 from SamuelToh/12546_annotation_nulls_existing_val
Add http patch support for annotations
2019-02-06 14:50:00 +01:00
Torkel Ödegaard a53c3b45fc Added a basic test for initDashboard thunk 2019-02-06 14:35:53 +01:00
Marcus Efraimsson 6848fe0edf docs: update annotaions http api 2019-02-06 14:26:43 +01:00
corpglory-dev e58f3a678d Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-06 14:31:23 +03:00
Alexander Zobnin e4446f0340 azuremonitor: improve autocomplete UX 2019-02-06 13:52:35 +03:00
Torkel Ödegaard 08a86250be Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-06 11:34:08 +01:00
Torkel Ödegaard 865d1567fc Added DashboardPage tests that tests view mode transition logic 2019-02-06 11:30:42 +01:00
Alexander Zobnin 4caea91164 azuremonitor: fix autocomplete menu height 2019-02-06 13:19:17 +03:00
Johannes Schill c47c2528aa Revert "chore: Replace sizeMe with AutoSizer in DashboardGrid"
This reverts commit ae0b027d69.
2019-02-06 09:45:09 +01:00
Johannes Schill 9c64e3b4b9 Revert "chore: Remove react-sizeme"
This reverts commit 260b6f5de8.
2019-02-06 09:45:03 +01:00
Marcus Efraimsson 85ef2ca738 fix spelling 2019-02-06 09:43:45 +01:00
Torkel Ödegaard 1fbdd02464 wip: tests 2019-02-06 09:04:38 +01:00
Marcus Efraimsson 44275d9660 middleware fix 2019-02-06 08:45:01 +01:00
Marcus Efraimsson d8658a765c enhanced expiration logic for lookup token
tokens are not expired if created_at > now - LoginMaxLifetimeDays and
rotated_at > now - LoginMaxInactiveLifetimeDays
2019-02-06 08:30:14 +01:00
Marcus Efraimsson 0be43948e2 changelog: add notes about closing #15265 2019-02-05 22:01:00 +01:00
Marcus Efraimsson e87ff5a06d Merge pull request #15265 from larsjoergensen/cloudwatch/add-rds-aurora-serverlessdatabasecapacity-metrics
Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics.
2019-02-05 21:56:11 +01:00
SamuelToh 4de9e3598b Address review comments 2019-02-06 06:41:39 +10:00
Marcus Efraimsson 9483506590 auth token clean up job now runs on schedule and deletes all expired tokens
delete tokens having created_at <= LoginMaxLifetimeDays or
rotated_at <= LoginMaxInactiveLifetimeDays
2019-02-05 21:20:11 +01:00
Marcus Efraimsson 871c84d195 changes needed for api/middleware due to configuration settings 2019-02-05 21:14:23 +01:00
Marcus Efraimsson 0915f931ae change configuration settings in auth package 2019-02-05 21:12:30 +01:00
Marcus Efraimsson 80d0943d9d document login, short-lived tokens and secure cookie configurations 2019-02-05 21:10:56 +01:00
Marcus Efraimsson 3c2fd02bc0 refactor login/auth token configuration settings
remove login section and reuse existing sections security and auth
2019-02-05 21:09:55 +01:00
Marcus Efraimsson 1d1b617cee remove unused code 2019-02-05 21:08:55 +01:00
Lars Jørgensen 749320002b Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics. 2019-02-05 20:57:51 +01:00
Marcus Efraimsson 3e129dffa0 changelog: add notes about closing #8207 2019-02-05 19:40:46 +01:00
Torkel Ödegaard 4d2cff41ff Minor code simplification 2019-02-05 19:38:51 +01:00
Marcus Efraimsson 26df20082b Merge pull request #14803 from jeroenvollenbrock/8207-resource-arns
cloudwatch: Add resource_arns template query function
2019-02-05 19:34:59 +01:00
Torkel Ödegaard 2196b4f1c2 Delete template.html 2019-02-05 19:34:31 +01:00
jeroenvollenbrock 28aafcd789 cloudwatch: Add tests for resource_arn template query 2019-02-05 18:37:05 +01:00
jeroenvollenbrock fa977ce090 cloudwatch: Add resource_arns template query function
Implements feature request #8207
2019-02-05 18:37:04 +01:00
jeroenvollenbrock 6fb76b7c9b update to aws-sdk-go v1.16.15 2019-02-05 18:37:04 +01:00
Torkel Ödegaard fa32198831 Merge branch 'master' into dashboard-react-page 2019-02-05 17:56:04 +01:00
Torkel Ödegaard 80ccea3d85 Merge pull request #15254 from grafana/update-add-panel-flow
Update add panel flow
2019-02-05 17:51:49 +01:00
Torkel Ödegaard 096751b658 Updated add panel related flows 2019-02-05 17:15:21 +01:00
Dominik Prokop 6b1390b972 Update types and themes usage in components 2019-02-05 17:04:48 +01:00
Dominik Prokop 1bc007e29c Implemented theme context and renamed/moved theme related types 2019-02-05 16:53:19 +01:00
Torkel Ödegaard a0bd022186 Merge pull request #15259 from grafana/hugoh/clicking-outside-timepicker-should-hide-it
Clicking outside TimePicker (Angular & React versions) should close it
2019-02-05 16:46:47 +01:00
Peter Holmberg 9d3d1bc669 refactor panel 2019-02-05 16:34:01 +01:00
Daniel Lee c19baaffaa changelog: adds note for #15182 2019-02-05 16:17:22 +01:00
Daniel Lee 9959bbfdfb Merge pull request #15260 from grafana/15182-stackdriver-filter
Changes default interpolation for Stackdriver filter to be regex. Fixes #15182
2019-02-05 16:14:48 +01:00
Torkel Ödegaard f5249d6033 Breaking init dashboard up in to fetch & init 2019-02-05 15:58:09 +01:00
Daniel Lee 1ecd70e2dd stackdriver: fixes #15182
For the filter expression, a better default is to
interpolate multi variables as a regex rather than
the default globbing pattern.

Also, uses the real TemplateSrv class rather than
stubbing it in the tests.
2019-02-05 15:42:59 +01:00
Hugo Häggmark e42b670f5c Closing timepicker when clicking outside the picker 2019-02-05 15:41:00 +01:00
Hugo Häggmark a344091d82 Optimized so we only do checks when dropdown is opened 2019-02-05 15:29:19 +01:00
Daniel Lee 0302c7afa7 stackdriver: add some more typings 2019-02-05 15:28:03 +01:00
Hugo Häggmark e2ffaef88a Fixed so that we close angular TimePicker when user clicks outside the dropdown 2019-02-05 15:25:19 +01:00
Torkel Ödegaard 6dd1a8e688 Merge pull request #15256 from grafana/hugoh/bug-explore-cut-and-paste
Handle onPaste because of bug in this Slate version
2019-02-05 15:23:14 +01:00
Torkel Ödegaard 49a597fcd0 Moved remove panel logic to dashboard srv 2019-02-05 15:15:15 +01:00
Peter Holmberg 9fc87e4174 first working draft 2019-02-05 15:12:04 +01:00
Torkel Ödegaard a624c9713a Removed unused controllers and services 2019-02-05 15:09:56 +01:00
Torkel Ödegaard 6d874dd1f1 Improved error handling 2019-02-05 14:42:29 +01:00
Johannes Schill e103143634 fix: Update snapshot 2019-02-05 14:42:18 +01:00
Johannes Schill f5431f5210 chore: Explore: Remove inner AutoSizer, spread the size-object to width/height, change height type to number 2019-02-05 14:42:18 +01:00
Johannes Schill 260b6f5de8 chore: Remove react-sizeme 2019-02-05 14:42:18 +01:00
Johannes Schill d68df9d704 fix: Calculation issue with AutoSizer in explore 2019-02-05 14:42:18 +01:00
Johannes Schill 097396c517 chore: Replace withSize with AutoSizer in explore/Graph.tsx 2019-02-05 14:42:18 +01:00
Johannes Schill ae0b027d69 chore: Replace sizeMe with AutoSizer in DashboardGrid 2019-02-05 14:42:18 +01:00
Torkel Ödegaard da53103281 Prevent viewers from going into edit mode 2019-02-05 14:18:35 +01:00
Torkel Ödegaard aa2bf07c71 Expand rows for panels in collapsed rows 2019-02-05 14:12:32 +01:00
Torkel Ödegaard 08925ffad8 Basic loading state for slow dashboards 2019-02-05 13:53:11 +01:00
Daniel Lee 310ee5674f Merge pull request #15252 from grafana/14940-update-checker-docs
docs: fixes #14940
2019-02-05 13:25:55 +01:00
Hugo Häggmark 9ba98b8703 Fixes #15223 by handling onPaste event because of bug in Slate 2019-02-05 13:13:52 +01:00
Torkel Ödegaard bbc5dff7bd Fixed add panel should scroll to top 2019-02-05 12:56:03 +01:00
Peter Holmberg 2802569529 minor layout change, simple render test 2019-02-05 12:47:42 +01:00
Alexander Zobnin 181b4f9e80 azuremonitor: improve autocomplete experence 2019-02-05 14:39:24 +03:00
Daniel Lee 139fb65fa9 docs: fixes #14940 2019-02-05 12:36:12 +01:00
Torkel Ödegaard fd1ef0a2be Added custom scrollbar and remember scroll pos to jump back to same scroll pos when going back to dashboard from edit mode 2019-02-05 12:10:42 +01:00
ijin08 0642c52693 created new color variables, changed primary to blue, changed success-btns to primary-btns. 2019-02-05 12:05:02 +01:00
Alexander Zobnin 4b5bfd3da5 azuremonitor: more autocomplete suggestions for built-in functions 2019-02-05 14:01:06 +03:00
Torkel Ödegaard 04f190c3e3 Updated playlist test 2019-02-05 11:11:17 +01:00
Torkel Ödegaard 6eb69d37de Merge pull request #15243 from ryantxu/better-stackdriver-logo
Better stackdriver logo (bigger + svg)
2019-02-05 10:22:40 +01:00
Torkel Ödegaard 44cef757e5 Merge branch 'hugoh/explore-refactor-initial-modified-queries' 2019-02-05 09:33:28 +01:00
Torkel Ödegaard bfdfb215f3 added missing typing to explore props 2019-02-05 09:32:42 +01:00
Torkel Ödegaard e4c92ae124 added comment to initDashboard 2019-02-05 09:24:30 +01:00
Torkel Ödegaard 3d5ca99d53 Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:24:14 +01:00
Torkel Ödegaard 28fc27c4ae Merge branch 'master' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:23:58 +01:00
ryan 275800cca9 improve the stackdriver logo 2019-02-04 23:19:14 -08:00
ryan 693bb43452 Merge remote-tracking branch 'grafana/master'
* grafana/master: (54 commits)
  now /api/login/ping returns Response
  fix: Explore: Query wrapping on long queries #15222
  fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122
  fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122
  fix util for splitting host and port
  changelog: add notes about closing #14231
  fixing logging action
  devenv: switching back using loki master plus various fixes
  Fix save provisioned dashboard modal
  Add AWS/Neptune to metricsMap and dimensionsMap
  did not add file, removing centerered
  Legend toggle should only trigger a re-render, not a refresh
  first stuff
  updated snapshot
  Adding pointer to colorpicker
  Minor post review changes
  More style tweaks to panel option group add button
  Made some style tweaks
  setting margin on label
  Make runQueries action independent from datasource loading
  ...
2019-02-04 23:06:03 -08:00
Hugo Häggmark 3b0a04c627 Fixed so onBlur event trigger an QueryChange and QueryExecute if values differ 2019-02-05 07:03:16 +01:00
Hugo Häggmark 2c255fd85a Renamed initialQueries to queries 2019-02-05 06:19:40 +01:00
SamuelToh a7a964ec19 Added PATCH verb end point for annotation op
Added new PATCH verb annotation endpoint

Removed unwanted fmt

Added test cases for PATCH verb annotation endpoint

Fixed formatting issue

Check arr len before proceeding

Updated doc to include PATCH verb annotation endpt
2019-02-05 09:43:17 +10:00
Marcus Efraimsson d53e64a32c move auth token middleware/hooks to middleware package
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
Marcus Efraimsson 7cd3cd6cd4 auth package refactoring
moving middleware/hooks away from package
exposing public struct UserToken accessible from other packages
fix debug log lines so the same order and naming are used
2019-02-05 00:10:56 +01:00
Torkel Ödegaard d29e1278dc render after leaving fullscreen 2019-02-04 21:39:48 +01:00
Marcus Efraimsson 57457e2aa4 Merge pull request #15170 from bergquist/delete_session_on_logout
deletes auth token on signout
2019-02-04 21:37:58 +01:00
Peter Holmberg e4dad78045 added flags to vizpicker from query param 2019-02-04 21:26:49 +01:00
Torkel Ödegaard 7d5becceb5 Merge pull request #15206 from grafana/storybook/valuemappingseditor
Adding ValueMappingsEditor to Storybook
2019-02-04 21:09:26 +01:00
Torkel Ödegaard 70974c01f2 Added playlist controls to new react DashNav 2019-02-04 21:08:30 +01:00
Marcus Efraimsson fb3c510178 Merge branch 'master' into delete_session_on_logout 2019-02-04 20:23:05 +01:00
Torkel Ödegaard 3b1da3758d Merge pull request #15234 from grafana/15222-explore-query-wrapping
Explore: Fix issue with wrapping on long queries
2019-02-04 18:43:42 +01:00
Torkel Ödegaard 60d7d9c691 Merge pull request #15181 from marefr/fix_ping_unauthorized
auth: /api/login/ping fixes
2019-02-04 18:41:35 +01:00
Torkel Ödegaard d978a66ef6 Fixed lots of loading flow issues and updated solo route page 2019-02-04 18:24:56 +01:00
Torkel Ödegaard 23ac9405c1 Set page title on dashboard load 2019-02-04 17:39:29 +01:00
Marcus Efraimsson cfd8eb5167 now /api/login/ping returns Response 2019-02-04 17:37:07 +01:00
Torkel Ödegaard 3baaf2c3e4 Added handling of kiosk mode 2019-02-04 17:36:04 +01:00
Dominik Prokop 7626ce9922 WIP Enable js defined theme to be used in SASS 2019-02-04 17:28:57 +01:00
Johannes Schill 9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +01:00
Alexander Zobnin 99ff8e68ff azuremonitor: fix where suggestions 2019-02-04 19:23:29 +03:00
Peter Holmberg f6b46f7a34 prepping go to visualization 2019-02-04 17:18:46 +01:00
Alexander Zobnin dd8ca70151 azuremonitor: use kusto editor for App Insights 2019-02-04 18:51:56 +03:00
Peter Holmberg b9c58d88dc basic layout 2019-02-04 16:48:27 +01:00
Torkel Ödegaard d4ecba5235 Merge pull request #15178 from marefr/loki_blocks_fixes
devenv: various fixes for Loki docker block
2019-02-04 16:26:33 +01:00
Torkel Ödegaard 3ceb436462 Merge pull request #15232 from grafana/15122-ace-editor-issues
Ace editor issues
2019-02-04 16:24:47 +01:00
Torkel Ödegaard fdeea9144c fixed unit test 2019-02-04 15:50:47 +01:00
Torkel Ödegaard 7162583396 Made dashboard view state srv panel view state obsolete 2019-02-04 15:44:08 +01:00
Johannes Schill 648bec1807 fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122 2019-02-04 15:19:23 +01:00
Hugo Häggmark f74ebdade6 Missed to save 2019-02-04 15:11:19 +01:00
Johannes Schill bc21c9520f fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122 2019-02-04 15:07:11 +01:00
Hugo Häggmark a0c4837eb5 Merge with master 2019-02-04 15:06:01 +01:00
Torkel Ödegaard f695975f65 Fixed handling of orgId 2019-02-04 15:02:35 +01:00
Torkel Ödegaard 7634e04231 Fixed template variable value changed handling 2019-02-04 14:45:13 +01:00
Hugo Häggmark 34dd1a22ab Fixed bug with removing a QueryRow thats not part of nextQueries 2019-02-04 14:16:15 +01:00
Torkel Ödegaard b58a3c939c Merge pull request #15194 from grafana/explore/url
Explore - UI panels state persistance in url
2019-02-04 14:10:50 +01:00
Torkel Ödegaard ae768193e3 Now handles all dashbord routes 2019-02-04 13:49:14 +01:00
Hugo Häggmark 96aef3bab8 Replaced intialQueris with queryKeys 2019-02-04 13:41:29 +01:00
Torkel Ödegaard 09708dfe20 Merge pull request #15226 from grafana/15189_fix
fix util for splitting host and port
2019-02-04 13:39:00 +01:00
Marcus Efraimsson d433ca7d40 fix util for splitting host and port
Now you can provide both a default host and a default port
2019-02-04 13:10:32 +01:00
Alexander Zobnin ad821cf629 azuremonitor: where clause autocomplete 2019-02-04 14:11:49 +03:00
Alexander Zobnin df9ecc6816 azuremonitor: don't go back to dashboard if escape pressed in the editor 2019-02-04 14:11:49 +03:00
Alexander Zobnin 0c3657da7e azuremonitor: suggest tables initially 2019-02-04 14:11:49 +03:00
Alexander Zobnin f2d2712a95 azuremonitor: add more builtin functions and operators 2019-02-04 14:11:49 +03:00
Hugo Häggmark efa48390b7 Reverted redux-logger 2019-02-04 12:09:06 +01:00
Hugo Häggmark 5e2b9e40a2 Added more typings 2019-02-04 11:25:07 +01:00
Torkel Ödegaard 217468074f added submenu, made sure submenu visibility is always up to date 2019-02-04 11:19:45 +01:00
Marcus Efraimsson eb8dfefb23 changelog: add notes about closing #14231 2019-02-04 11:16:11 +01:00
Marcus Efraimsson 7436723686 Merge pull request #15214 from tcpatterson/cloudwatch-neptune-metrics
Add support for AWS/Neptune in Cloudwatch
2019-02-04 11:12:49 +01:00
Hugo Häggmark 6b98b05976 Removed modifiedQueries from state 2019-02-04 11:07:32 +01:00
Peter Holmberg c61e905434 fixing logging action 2019-02-04 10:22:45 +01:00
Torkel Ödegaard c15ab1b2bc Merge pull request #15219 from grafana/fix-provisioned-modal
Fix save provisioned dashboard modal
2019-02-04 10:18:22 +01:00
Marcus Efraimsson fdd5ac1895 devenv: switching back using loki master plus various fixes 2019-02-04 09:55:23 +01:00
Torkel Ödegaard f5084045f2 Fix save provisioned dashboard modal 2019-02-04 09:32:39 +01:00
Hugo Häggmark d9578bc485 Merge with master 2019-02-04 08:17:18 +01:00
Hugo Häggmark 1f5bb76718 Refactor of action, actionTypes and reducer 2019-02-04 07:50:17 +01:00
Hugo Häggmark 2d0fd96621 More types and some refactoring 2019-02-04 07:50:17 +01:00
Hugo Häggmark acea1d7f00 Alignment of interfaces and components 2019-02-04 07:50:17 +01:00
Hugo Häggmark 43f8098981 Removed the on every key change event 2019-02-04 07:48:25 +01:00
Connor Patterson 48c8ff8899 Add AWS/Neptune to metricsMap and dimensionsMap 2019-02-03 16:29:35 -05:00
Torkel Ödegaard 883f7a164b added time picker 2019-02-03 21:06:07 +01:00
Torkel Ödegaard 0324de37d2 refactorings and cleanup 2019-02-03 20:38:13 +01:00
Paresh 1f3fafb198 mssql: pass timerange for template variable queries 2019-02-03 13:07:33 -06:00
Torkel Ödegaard d7151e5c88 improving dash nav react comp 2019-02-03 18:25:13 +01:00
Torkel Ödegaard 4a8effddf5 fixed panel removal 2019-02-03 17:15:23 +01:00
Torkel Ödegaard 09efa24f28 Added more buttons in dashboard nav 2019-02-03 15:29:14 +01:00
Torkel Ödegaard 2cb1733c59 wip: progress 2019-02-03 14:53:42 +01:00
Torkel Ödegaard cba2ca5531 Url state -> dashboard model state sync starting to work 2019-02-03 12:29:47 +01:00
Torkel Ödegaard 8dec74689d Dashboard settings starting to work 2019-02-03 10:55:58 +01:00
Torkel Ödegaard 83937f59c0 wip: dashboard in react starting to work 2019-02-02 23:01:48 +01:00
Torkel Ödegaard d86e773c75 wip: minor progress 2019-02-02 22:43:19 +01:00
Torkel Ödegaard 60f700a1d2 wip: dashboard react 2019-02-02 19:23:19 +01:00
Sean Lafferty fa22311a95 base64 encode encrypted oauth token fields 2019-02-02 09:03:04 -05:00
Athurg Feng 70b23ab73b Add string quote func 2019-02-02 13:36:10 +08:00
Athurg Feng bba92c0746 Remove option used to control within browser 2019-02-02 13:35:17 +08:00
Sean Lafferty 4a7cf82f5f Remove length from text columns 2019-02-01 19:45:27 -05:00
Sean Lafferty 5a59cdf0ef Add oauth pass-thru option for datasources 2019-02-01 19:40:57 -05:00
Peter Holmberg 9ac960a803 did not add file, removing centerered 2019-02-02 00:48:13 +01:00
Peter Holmberg a4d35e2fbc Merge branch 'master' into storybook/valuemappingseditor 2019-02-02 00:31:48 +01:00
Torkel Ödegaard 9e33f8b7c4 Merge pull request #15203 from jsferrei/optimize_legend
Legend toggle should only trigger a re-render, not a refresh
2019-02-01 20:57:29 +01:00
Jon Ferreira e2c958eb43 Legend toggle should only trigger a re-render, not a refresh 2019-02-01 14:16:27 -05:00
Torkel Ödegaard cab6a872cf Merge pull request #15200 from grafana/fix/add-pointer-to-color-picker
Add pointer cursor to colorpicker
2019-02-01 16:05:33 +01:00
Peter Holmberg bd6fed54de first stuff 2019-02-01 15:45:47 +01:00
Torkel Ödegaard 35693d3b23 Merge pull request #15199 from grafana/fix/label-margin-datasource-list
setting margin on label in datasourcelist
2019-02-01 15:43:28 +01:00
Torkel Ödegaard 16f30664f5 Merge branch 'collapseable-panel-option-groups' 2019-02-01 15:39:47 +01:00
Torkel Ödegaard 59dfe794f5 updated snapshot 2019-02-01 15:39:20 +01:00
Torkel Ödegaard 3a5f03c772 Merge pull request #15191 from bergquist/samesite_for_cookies
introduce samesite setting for login cookie
2019-02-01 15:37:43 +01:00
Torkel Ödegaard 3f1fd6c6f2 Merge pull request #15193 from w4tsn/patch-1
Clearify the Run from master instructions
2019-02-01 15:37:04 +01:00
Torkel Ödegaard 116e70740c Merge pull request #15012 from grafana/loki-query-editor
WIP: Loki query editor for dashboard panels
2019-02-01 15:33:23 +01:00
Peter Holmberg 7d958080c1 Adding pointer to colorpicker 2019-02-01 15:31:42 +01:00
Dominik Prokop 1a0b21b8d1 Minor post review changes 2019-02-01 15:27:02 +01:00
Torkel Ödegaard 24ccfb9ccc More style tweaks to panel option group add button 2019-02-01 15:23:32 +01:00
Torkel Ödegaard 3be1deea44 Made some style tweaks 2019-02-01 15:19:18 +01:00
Peter Holmberg 4b03e7c31f setting margin on label 2019-02-01 15:03:19 +01:00
Dominik Prokop 3c358e406e Make runQueries action independent from datasource loading 2019-02-01 14:56:54 +01:00
Peter Holmberg 609129c039 fixing test 2019-02-01 14:23:03 +01:00
Peter Holmberg 025d37e9a2 add button in header 2019-02-01 14:19:53 +01:00
Torkel Ödegaard d1d5bbf697 Merge pull request #15188 from grafana/fix/table-data-to-component
React panel table data fix
2019-02-01 13:57:26 +01:00
Torkel Ödegaard 2a4b10a5c8 minor fix 2019-02-01 13:40:46 +01:00
Torkel Ödegaard 740e1a0540 Made really good progress on loki support in dashboards 2019-02-01 13:30:15 +01:00
Dominik Prokop 2ddccb4a21 Temporarily run queries independently from UI state of explore panels 2019-02-01 12:57:09 +01:00
corpglory-dev 6d03766ace Remove extra newline 2019-02-01 14:54:38 +03:00
Alexander Wellbrock ab1ae1b2a7 Clearify the Run from master instructions
Especially for new developers to the go and yarn ecosystems this readme part is quite confusing.
2019-02-01 12:51:40 +01:00
corpglory-dev 9a3f4def98 Use slate-plugins from app/features/explore 2019-02-01 14:49:04 +03:00
corpglory-dev bdd59de877 Remove newline && runner plugins 2019-02-01 14:47:33 +03:00
corpglory-dev cf60ae79c3 Move prism to app/features/explore 2019-02-01 14:47:17 +03:00
Dominik Prokop 6ab9355146 Restoring explore panels state from URL 2019-02-01 12:33:15 +01:00
corpglory-dev ce2209585c Remove version.ts 2019-02-01 14:32:40 +03:00
bergquist a6bd2c73a0 introduce samesite setting for login cookie
ref #15067
2019-02-01 11:47:21 +01:00
Torkel Ödegaard 6e0b873739 Merge branch 'master' into loki-query-editor 2019-02-01 11:17:22 +01:00
Peter Holmberg 57596462a4 sending paneldata to component, gauge can handle table data 2019-02-01 10:53:58 +01:00
bergquist a1b3986532 always delete session cookie even if db delete fails 2019-02-01 09:59:53 +01:00
Torkel Ödegaard 68ae17e4a4 Merge pull request #15155 from grafana/solo-panel-rewrite
New react container route for solo panels
2019-02-01 09:55:00 +01:00
Torkel Ödegaard 3d78cb4f8c Merge pull request #15158 from grafana/hugoh/redux-poc
WIP: Reducing boilerplate code for Redux
2019-02-01 09:41:40 +01:00
Torkel Ödegaard 82f0388af6 Merge pull request #15183 from grafana/dashboard-row-fixes
Fixed dashboard row title not updating when variable changed
2019-02-01 08:19:15 +01:00
Torkel Ödegaard aeaac7480b New solo panel route working in all scenarios I can test 2019-02-01 08:15:21 +01:00
Torkel Ödegaard c4f55fecbe Merge branch 'master' into solo-panel-rewrite 2019-02-01 07:09:45 +01:00
Hugo Häggmark efec897fd4 Removed unused factory and fixed index based mapper lookup 2019-02-01 06:52:25 +01:00
Torkel Ödegaard ac0140d596 Fixed dashboard row title not updating when variable changed, fixes #15133 2019-02-01 06:38:59 +01:00
Torkel Ödegaard e54689a964 Removed comment from panel editor 2019-02-01 06:20:54 +01:00
Marcus Efraimsson bd83078025 signout user if /api/login/ping returns 401 unauthorized 2019-02-01 01:22:56 +01:00
Marcus Efraimsson dd5a8275f1 must return json response from /api/login/ping
Even though http error 401 was returned, the result was still a http 200
2019-02-01 01:21:23 +01:00
bergquist 91bd908e03 adds more tests signing out session 2019-01-31 22:24:04 +01:00
ryan 5739ad3cfc Merge remote-tracking branch 'grafana/master'
* grafana/master: (835 commits)
  changes some info logging to debug
  add missing ngInject annotation
  typing data
  changelog: adds note about closing #10780
  Do not render time region line or fill if colors not provided
  Fixed row options html template location, fixes #15157
  creating table data type
  build: enterprise release co project.
  Moved dashboard state components to state folder
  Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard
  Moved a few things around
  Updated what's new article
  Update CHANGELOG.md
  Update CHANGELOG.md
  Replace usages of kbn.valueFormats with ui/getValueFormat
  Fix anchor
  Added download links to docs
  Updated docs
  Updated version again
  Updated version and made some changes to changelog and what's new article
  ...
2019-01-31 12:56:07 -08:00
bergquist 11c4967bdc changes some info logging to debug 2019-01-31 21:51:14 +01:00
Dominik Prokop f9bab9585a wip 2019-01-31 19:38:49 +01:00
Marcus Efraimsson 0442a86400 tailing grafana logs and temporaily using an older build 2019-01-31 19:22:25 +01:00
Torkel Ödegaard 1e0de188b0 Merge pull request #15172 from grafana/15171_fix
add missing ngInject annotation
2019-01-31 18:38:05 +01:00
Marcus Efraimsson c7b5fca885 add missing ngInject annotation 2019-01-31 16:45:32 +01:00
bergquist 88ca54eba9 renames signout function 2019-01-31 16:26:36 +01:00
bergquist 43ac79685a delete auth token on signout 2019-01-31 16:13:35 +01:00
Torkel Ödegaard 59dc91ada3 Merge pull request #15163 from grafana/table-data-support
Table data support
2019-01-31 14:45:03 +01:00
Peter Holmberg ed0f5b71c7 Merge branch 'master' into table-data-support 2019-01-31 14:16:06 +01:00
Peter Holmberg 7def403018 typing data 2019-01-31 13:59:25 +01:00
bergquist 53331772ef changelog: adds note about closing #10780 2019-01-31 13:43:04 +01:00
Torkel Ödegaard 06a9c7bacc Merge pull request #15160 from grafana/fix/time-region-missing-colors
Do not render time region line or fill if colors not provided
2019-01-31 13:23:12 +01:00
Dominik Prokop a2cba6685c Do not render time region line or fill if colors not provided 2019-01-31 12:20:55 +01:00
Torkel Ödegaard 6c1f8a9cfe Merge pull request #15159 from grafana/row-options-fix
Fixed row options html template location,
2019-01-31 12:13:35 +01:00
Torkel Ödegaard a43c00ce70 Fixed row options html template location, fixes #15157 2019-01-31 11:37:34 +01:00
Carl Bergquist e2c2b70a61 Merge pull request #14852 from jpenalbae/pushover-attach
pushover: add support for attaching images (closes #10780)
2019-01-31 11:18:08 +01:00
Peter Holmberg 88cb38adde creating table data type 2019-01-31 09:59:21 +01:00
Torkel Ödegaard 6a4777eafc wip: New react container route for solo panels that supports both angular and react panels 2019-01-31 09:44:37 +01:00
Torkel Ödegaard 7e1b6f59fe Merge pull request #15149 from grafana/dashboard-refactorings
Dashboard organization refactorings (file names / locations)
2019-01-31 09:43:26 +01:00
Leonard Gram ddfccec2ea build: enterprise release co project. 2019-01-31 09:42:50 +01:00
Hugo Häggmark 7e64ee8225 Fixed another type of fluent reducerFactory 2019-01-31 09:18:40 +01:00
Torkel Ödegaard aafd4a339a Moved dashboard state components to state folder 2019-01-31 08:56:17 +01:00
Torkel Ödegaard 6663b2fab9 Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard 2019-01-31 08:44:46 +01:00
Torkel Ödegaard 474185c977 Moved a few things around 2019-01-31 08:37:15 +01:00
Hugo Häggmark 99b500c740 Removed then clauses, no need to test the test within the test 2019-01-31 07:48:33 +01:00
Torkel Ödegaard ab812e73f6 Updated what's new article 2019-01-31 07:47:55 +01:00
Hugo Häggmark 6a84a85a80 Added reducerTester, reducer tests and tests 2019-01-31 07:37:36 +01:00
Torkel Ödegaard 08cfa5e32a Update CHANGELOG.md 2019-01-31 07:31:12 +01:00
Torkel Ödegaard ca7afc10a9 Update CHANGELOG.md 2019-01-31 07:30:45 +01:00
Torkel Ödegaard bcae94f8ca Merge pull request #15135 from grafana/tooling/stortybook-from-root
Add storybook script to run it from root dir
2019-01-31 07:25:52 +01:00
Torkel Ödegaard 36a2b9c015 Merge pull request #15136 from grafana/react-snapshots
React snapshots
2019-01-31 07:24:25 +01:00
Torkel Ödegaard f643e2abe6 Merge pull request #15144 from Rohlik/patch-1
Fix anchor
2019-01-31 07:23:13 +01:00
Torkel Ödegaard 17ef221c68 Merge pull request #15146 from atjeff/remove-kbn-value-formats
Replace usages of kbn.valueFormats with ui/getValueFormat
2019-01-31 07:22:41 +01:00
Hugo Häggmark 2f47b225a0 Removed ActionTypes and fixed a noPayloadActionCreatorFactory 2019-01-31 06:38:40 +01:00
Jeff Hage f13018ce05 Replace usages of kbn.valueFormats with ui/getValueFormat 2019-01-30 18:57:33 -05:00
Hugo Häggmark d3815beb1c Refactored Datasources as POC 2019-01-30 20:07:14 +01:00
Thomas Rohlik e83831904a Fix anchor 2019-01-30 18:52:40 +01:00
Torkel Ödegaard e3472f6d81 Added download links to docs 2019-01-30 17:53:41 +01:00
Torkel Ödegaard b8427ba379 Updated docs 2019-01-30 17:28:43 +01:00
Torkel Ödegaard 6fd60c639f Updated version again 2019-01-30 17:20:43 +01:00
Torkel Ödegaard d7f81c4795 Updated version and made some changes to changelog and what's new article 2019-01-30 17:14:42 +01:00
Torkel Ödegaard 3ad48ff7e5 docs: Added version notice for time range variables 2019-01-30 16:54:09 +01:00
Torkel Ödegaard b32c3a9d84 Merge branch 'whatsnew-6-0' 2019-01-30 16:52:22 +01:00
Torkel Ödegaard 70c35d646f Added loki video 2019-01-30 16:51:59 +01:00
Torkel Ödegaard 26096c65a5 spell fixes 2019-01-30 16:15:56 +01:00
Torkel Ödegaard bd688449f8 Merge pull request #15119 from grafana/explore/queries-import-changes
Fix queries being imported incorrectly on datasource change
2019-01-30 16:11:36 +01:00
Torkel Ödegaard c33e94f438 Merge pull request #15141 from grafana/14946-panel-menu-on-move
Don't show panel menu on move
2019-01-30 16:11:10 +01:00
Johannes Schill 3165305377 chore: Add typings for react-grid-layout and react-virtualized 2019-01-30 15:44:34 +01:00
Johannes Schill 1afc590c70 fix: Don't open panel menu when dragging (react-)panel in dashboard #14946 2019-01-30 15:38:59 +01:00
Johannes Schill ef4611eb56 chore: Add missing typings in PanelResizer 2019-01-30 15:32:29 +01:00
Johannes Schill 1230f3e48d chore: Fix typings and remove bindings for arrow functions in DashboardGrid 2019-01-30 15:28:41 +01:00
Torkel Ödegaard 8aed401640 Updated explore section again 2019-01-30 14:47:23 +01:00
Torkel Ödegaard 5fa8c53d2e Updated explore section 2019-01-30 14:44:35 +01:00
Torkel Ödegaard 2ca34376a0 fixe merge issue 2019-01-30 14:33:49 +01:00
Torkel Ödegaard 5b67ebde0c Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 14:23:40 +01:00
Torkel Ödegaard 909acb08ef updated what's new article 2019-01-30 14:17:34 +01:00
Peter Holmberg 4b47e857f2 adjusting types to match 2019-01-30 13:43:17 +01:00
Dominik Prokop d784accdec Add storybook script to run it from root dir 2019-01-30 12:54:24 +01:00
Hugo Häggmark 2236a1a36d Minor change to Action interfaces 2019-01-30 12:03:30 +01:00
Hugo Häggmark 94ce065f74 Simplified inteface for reducerFactory 2019-01-30 11:59:00 +01:00
Hugo Häggmark 65fb77ce73 Fixed a small bug and added case sensitivity 2019-01-30 11:28:23 +01:00
Torkel Ödegaard 67756c43a7 Merge pull request #15118 from grafana/1909/from-to-template-variables
Time range from & to as template variables
2019-01-30 11:17:22 +01:00
Daniel Lee 3bb5930c54 docs: whats new tweaks 2019-01-30 11:16:26 +01:00
Torkel Ödegaard 7dc3303e05 Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 11:14:51 +01:00
Hugo Häggmark 0ddaa95d0e Added reducerFactory and tests 2019-01-30 11:13:36 +01:00
Torkel Ödegaard ce617bc02e Minor updates to text and image placements 2019-01-30 11:12:07 +01:00
Daniel Lee 0b971d48c2 docs: add video link to what's new 2019-01-30 11:11:27 +01:00
bergquist 445b427fb6 whats new: note about session storage 2019-01-30 10:52:42 +01:00
Peter Holmberg ae0b9692be first implementation 2019-01-30 10:39:42 +01:00
Hugo Häggmark 62341ffe56 Added actionCreatorFactory and tests 2019-01-30 10:31:38 +01:00
bergquist dfd87c3b93 whats new: provisioning for alert notifiers 2019-01-30 09:54:08 +01:00
Dominik Prokop 661de1efe1 Rename SetInitialQueries action to QueriesImported 2019-01-30 09:50:28 +01:00
Dominik Prokop d746df485c Add missing code 2019-01-30 09:36:23 +01:00
Dominik Prokop ca0d2996f2 Merge branch 'master' into explore/queries-import-changes 2019-01-30 09:30:10 +01:00
Daniel Lee a21f6777c1 changelog: adds note for #15129 2019-01-30 00:50:07 +01:00
Daniel Lee 782c4eae98 Merge pull request #15127 from challengerdeep/fix-stackdriver-aggparams-reducer
Change primaryAggregation to crossSeriesReducer in Stackdriver
2019-01-30 00:45:22 +01:00
Daniel Lee 368494bb16 docs: update to what's new 2019-01-30 00:25:32 +01:00
Daniel Lee 13579b76d9 docs: wip - what's new for 6.0 2019-01-29 23:51:16 +01:00
Torkel Ödegaard 0c4f59a7f1 Minor style fix to button group 2019-01-29 21:30:31 +01:00
Torkel Ödegaard 9a598be4f7 Fixed failing unit test 2019-01-29 21:17:56 +01:00
Torkel Ödegaard 416562bd90 Merge pull request #15102 from mjtrangoni/fix-golint-issues
Fix golint issues
2019-01-29 21:12:34 +01:00
Torkel Ödegaard 77bb3ddf62 Added basic docs 2019-01-29 20:53:49 +01:00
Torkel Ödegaard 8b68ba5cbb Minor refactoring and adding some typing 2019-01-29 20:49:54 +01:00
Marcus Efraimsson 6756931bcd changelog: add notes about closing #14709 2019-01-29 20:33:34 +01:00
Torkel Ödegaard 4c689fce96 Merge pull request #15121 from grafana/davkal/15011-fix-query-change-twice
Explore: query field should not propagate non-text change
2019-01-29 20:29:47 +01:00
Torkel Ödegaard a747023b28 Merge pull request #15128 from grafana/sqlite-fix
fixed sqlite issue introduced by #14709
2019-01-29 20:28:35 +01:00
Torkel Ödegaard a2dd6f378f fixed sqlite issue introduced by #14709 2019-01-29 20:27:01 +01:00
Marcus Efraimsson a067862a0a Merge pull request #14709 from tpetr/extra-connection-string-args
add support for defining additonal database connection string args
2019-01-29 20:13:17 +01:00
Torkel Ödegaard ff8db0a530 Merge pull request #15120 from grafana/panel-option-styles
Tweaked panel option group styles
2019-01-29 20:06:03 +01:00
Torkel Ödegaard e5eb66a27c Merge pull request #15123 from grafana/fix/remove-alpha-from-gauge
Remove alpha from Gauge panel
2019-01-29 20:05:42 +01:00
Torkel Ödegaard af6a7b1f55 Merge pull request #15125 from grafana/15108-page-title-update
Update <title> when navModel is changed
2019-01-29 20:05:19 +01:00
Robert Edström 9b6746d808 Change primaryAggregation to crossSeriesReducer in Stackdriver 2019-01-29 19:11:54 +01:00
Marcus Efraimsson 920f51f2db update changelog 2019-01-29 18:20:25 +01:00
Marcus Efraimsson 51451d10a3 changelog: add notes about closing #12764 2019-01-29 18:15:45 +01:00
Johannes Schill 7d8607c1b3 fix: Remove legacy title-prop and update document.title when navModel is changed #15108 2019-01-29 17:03:40 +01:00
Daniel Lee 365de9de20 Merge pull request #14626 from grafana/azure-monitor
Azure Monitor: move files into grafana
2019-01-29 16:11:17 +01:00
David Kaltschmidt 8d44ed8d8f Explore: query field should not propagate non-text change
- after mounting with an initial value, the onChange of a query field is triggered
- even though the slate documents are not the same, their text values are identical, hence the change propagation is useless
- added check to propagate text change only when text has actually changed
2019-01-29 15:53:51 +01:00
Dominik Prokop 9ddbfed730 Wait for queries to be imported before proceeding with datasource change 2019-01-29 15:52:36 +01:00
Peter Holmberg 6164427efd removing alpha 2019-01-29 15:46:55 +01:00
Dominik Prokop 8ea72eeaf7 Remove commented code 2019-01-29 15:40:01 +01:00
Torkel Ödegaard 0ac0588583 Merge pull request #15107 from grafana/explore-query-styles
Updated Explore query styles to align them to other query editors
2019-01-29 15:38:06 +01:00
Torkel Ödegaard f28d38ceef Merge pull request #15117 from grafana/explore-time-range-fix
Fixed issue with explore changeTime redux action not being hooked up
2019-01-29 15:37:41 +01:00
Torkel Ödegaard 7196f7b093 Tweaked panel option group styles 2019-01-29 15:37:22 +01:00
Daniel Lee a3e09d8bbc azuremonitor: fixes merge conflict in yarn.lock 2019-01-29 15:35:43 +01:00
Dominik Prokop 010f902003 Import queries before datasource is changed 2019-01-29 15:34:28 +01:00
Torkel Ödegaard a803435b27 fixed prettier on switch component 2019-01-29 15:16:04 +01:00
Torkel Ödegaard e1dad8488b Merge pull request #15109 from grafana/fix/explore-switches
Propagate event to onChange prop in Switch component
2019-01-29 15:15:23 +01:00
Torkel Ödegaard f7a1e4c185 Merge pull request #15106 from grafana/tooltip-restyling
Tooltip restyling
2019-01-29 15:07:54 +01:00
Peter Holmberg 78cb3239b8 adding from and to built in variables 2019-01-29 15:05:28 +01:00
Daniel Lee 2d3e02d58b azuremonitor: adds macros to slate intellisense
and adds tab as well as enter key for autocomplete
2019-01-29 15:02:46 +01:00
Torkel Ödegaard ab322bebf0 Merge pull request #15110 from grafana/15053/gauge-value-font-size
Automatically scale font size on Gauge value
2019-01-29 15:01:03 +01:00
Torkel Ödegaard d53a430c82 Fixed issue with explore changeTime redux action not being hooked up, fixes #15115 2019-01-29 14:58:57 +01:00
Torkel Ödegaard 0216f087b7 Merge pull request #15113 from grafana/fix/explore-set-state-on-unmounted
Fix setState on unmounted component in Loki and Prometheus QueryField
2019-01-29 14:42:35 +01:00
Torkel Ödegaard 8b70a8dd50 Fixed explore query editor styling issues 2019-01-29 14:36:09 +01:00
Alexander Zobnin a1609a8d53 azuremonitor: remove wrong completions 2019-01-29 16:03:30 +03:00
Alexander Zobnin a0cae98e0d azuremonitor: autocomplete on enter 2019-01-29 16:02:25 +03:00
Torkel Ödegaard 71d0fae3a9 Progress on tooltip style update 2019-01-29 13:42:29 +01:00
Alexander Zobnin 2a1558cefc azuremonitor: fix tests 2019-01-29 15:39:16 +03:00
Daniel Lee cab1e9445b Merge pull request #15112 from grafana/loki-docker-block
docker: block for loki
2019-01-29 13:32:02 +01:00
Marcus Efraimsson 60967de2b4 devenv: loki provisioned datasource 2019-01-29 13:03:49 +01:00
Alexander Zobnin cbcf557a34 azuremonitor: revert "memory for webpack build" 2019-01-29 14:33:58 +03:00
Alexander Zobnin 15d42ba414 Merge remote-tracking branch 'upstream/azure-monitor' into azure-monitor 2019-01-29 14:29:31 +03:00
Alexander Zobnin fefb2c2ba2 Azure Monitor: replace monaco by slate with initial Kusto syntax 2019-01-29 14:19:31 +03:00
Daniel Lee 62a04d8ef5 docker: block for loki 2019-01-29 12:14:26 +01:00
Dominik Prokop 27948b1308 Make language provider cancelable in Loki and Prometheus QueryField, to avoid setting state on unmounted component 2019-01-29 12:11:48 +01:00
Dominik Prokop db17262ea4 Add util for handling promise cancelation to avoid setting state on unmounted components
https://github.com/facebook/react/issues/5465
2019-01-29 12:10:03 +01:00
Daniel Lee 4a057ef725 stackdriver: remove beta notice from config page 2019-01-29 12:00:52 +01:00
Peter Holmberg b0984cd503 Merge branch 'master' into 15053/gauge-value-font-size 2019-01-29 11:20:16 +01:00
Torkel Ödegaard 0e2310de8e Merge branch 'master' into tooltip-restyling 2019-01-29 11:02:40 +01:00
Peter Holmberg 462bdb6d13 increasing font size on longer strings 2019-01-29 11:01:35 +01:00
Peter Holmberg 4b0df606d5 magic number solution 2019-01-29 10:35:42 +01:00
Dominik Prokop 628c5c1da6 Propagate event to onChange prop in Switch component 2019-01-29 09:53:45 +01:00
Torkel Ödegaard 433c88a616 two minor bug fixes introduced in recent refactorings 2019-01-29 09:47:41 +01:00
Torkel Ödegaard 0de861a3a8 Minor progress on react query editor support, solving updating query persisted state 2019-01-29 09:39:23 +01:00
ijin08 fe51e85050 did some styling changes 2019-01-29 08:47:28 +01:00
Torkel Ödegaard 57fe7d5050 Merge pull request #15103 from grafana/14762-page-component-everywhere
Page component on all React pages pt2
2019-01-29 08:15:46 +01:00
Torkel Ödegaard 6dad4cce07 Updated Explore query styles to align them to other query editor to make them fit in better 2019-01-29 08:14:07 +01:00
Torkel Ödegaard e4244d8bf8 Merge branch 'master' into loki-query-editor 2019-01-29 07:10:06 +01:00
Torkel Ödegaard 459a93da10 Merge pull request #15100 from grafana/annotation-dashboard-switch-fix
Fix for annotations not clearing when switching dashboards
2019-01-29 06:53:20 +01:00
Johannes Schill 186ed1a333 chore: Fix typings and add Page-component to FolderPermissions #14762 2019-01-28 23:19:19 +01:00
Johannes Schill ab62a09fe6 chore: Fix typings and add Page-component to ServerStats #14762 2019-01-28 23:19:19 +01:00
Johannes Schill d54c4173ca chore: Fix typings and add Page-component to AlertRuleList #14762 2019-01-28 23:19:19 +01:00
Johannes Schill e448a140f5 chore: Fix typings and add Page-component to DataSourceDashboards #14762 2019-01-28 23:19:19 +01:00
Johannes Schill acbcca1102 fix: Add plugins to StoreState interface 2019-01-28 23:19:19 +01:00
Johannes Schill 7df00747d3 chore: Fix typings and add Page-component to NewDataSourcePage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill 98fa17f0e4 chore: Fix typings and add Page-component to DataSourceSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill 3372dc9441 chore: Fix typings and add Page-component to FolderSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill d9a25ee505 test: Updated snapshot 2019-01-28 23:19:18 +01:00
Johannes Schill 730036e18d chore: Fix typings and add Page-component to TeamPages #14762 2019-01-28 23:19:18 +01:00
Johannes Schill 03cebecac3 fix: Add pageName default to avoid "Loading undefined..." 2019-01-28 23:19:18 +01:00
bergquist c1d778c704 changelog: adds note about closing #10487 2019-01-28 22:56:24 +01:00
Carl Bergquist c6f80ecec2 Merge pull request #14229 from pbakulev/configurable-alert-notification
Configurable alert notification
2019-01-28 22:47:12 +01:00
Mario Trangoni b7628f2060 pkg/util/{filepath.go,shortid_generator.go}: Fix golint issues
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
filepath.go:12:5⚠️ error var WalkSkipDir should have name of the form ErrFoo (golint)
shortid_generator.go:11:5⚠️ var validUidPattern should be validUIDPattern (golint)
shortid_generator.go:19:6⚠️ func IsValidShortUid should be IsValidShortUID (golint)
shortid_generator.go:24:6⚠️ func GenerateShortUid should be GenerateShortUID (golint)
2019-01-28 22:37:44 +01:00
Mario Trangoni 8261613b51 pkg/util/{ip.go,url.go}: Fix some golint issues
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint)
url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint)
url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint)
url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)
2019-01-28 22:29:20 +01:00
Mario Trangoni 5f6383a750 pkg/util/*: Add missing function comments.
See,

$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
encoding.go:15:1⚠️ comment on exported function GetRandomString should be of the form "GetRandomString ..." (golint)
encoding.go:30:1⚠️ exported function EncodePassword should have comment or be unexported (golint)
encoding.go:35:1⚠️ comment on exported function EncodeMd5 should be of the form "EncodeMd5 ..." (golint)
encoding.go:42:1⚠️ comment on exported function PBKDF2 should be of the form "PBKDF2 ..." (golint)
encoding.go:80:1⚠️ exported function GetBasicAuthHeader should have comment or be unexported (golint)
encoding.go:85:1⚠️ exported function DecodeBasicAuthHeader should have comment or be unexported (golint)
encoding.go:105:1⚠️ exported function RandomHex should have comment or be unexported (golint)
encryption.go:14:1⚠️ exported function Decrypt should have comment or be unexported (golint)
encryption.go:39:1⚠️ exported function Encrypt should have comment or be unexported (golint)
ip.go:7:1⚠️ exported function SplitIpPort should have comment or be unexported (golint)
json.go:3:6⚠️ exported type DynMap should have comment or be unexported (golint)
md5.go:22:1⚠️ comment on exported function Md5SumString should be of the form "Md5SumString ..." (golint)
strings.go:10:1⚠️ exported function StringsFallback2 should have comment or be unexported (golint)
strings.go:14:1⚠️ exported function StringsFallback3 should have comment or be unexported (golint)
strings.go:27:1⚠️ exported function SplitString should have comment or be unexported (golint)
strings.go:35:1⚠️ exported function GetAgeString should have comment or be unexported (golint)
url.go:8:6⚠️ exported type UrlQueryReader should have comment or be unexported (golint)
url.go:12:1⚠️ exported function NewUrlQueryReader should have comment or be unexported (golint)
url.go:23:1⚠️ exported method UrlQueryReader.Get should have comment or be unexported (golint)
url.go:32:1⚠️ exported function JoinUrlFragments should have comment or be unexported (golint)
validation.go:16:1⚠️ exported function IsEmail should have comment or be unexported (golint)
2019-01-28 22:09:40 +01:00
bergquist e218cc7637 docs: updates docs to refer to using uid 2019-01-28 22:03:16 +01:00
Daniel Lee e813a6d522 azuremonitor: increase memory for webpack build
The gigantic monaco dependency needs more memory so
it fails on CircleCI with the default memory allocation
of 2GB for a worker.
2019-01-28 21:34:20 +01:00
bergquist 7c93335d28 gofmt issue 2019-01-28 21:04:08 +01:00
Torkel Ödegaard daab7a5f6e Merge pull request #15099 from grafana/tooling/storybook-poc
Named colors & storybook
2019-01-28 20:47:46 +01:00
bergquist 809019d4ee moves test files into testdata folder 2019-01-28 20:44:10 +01:00
bergquist 8f0e65a150 renames alert_notifications -> notifiers 2019-01-28 20:39:09 +01:00
Marcus Efraimsson bc34ccc9b2 changelog: add notes about closing #14711 2019-01-28 20:31:21 +01:00
Marcus Efraimsson fce354875c Merge pull request #14711 from ander26/nanosecond-postgresql
sql datasources: nanosecond timestamp support
2019-01-28 20:26:45 +01:00
Marcus Efraimsson 7023c957d7 Merge branch 'master' into nanosecond-postgresql 2019-01-28 20:04:46 +01:00
Marcus Efraimsson 3a53f75ebb update inline documentation 2019-01-28 19:52:35 +01:00
Marcus Efraimsson f157c19e16 extract parsing of datasource tls config to method 2019-01-28 19:38:56 +01:00
Marcus Efraimsson 7df5e3cebf extract tls auth settings directive from datasource http settings directive 2019-01-28 19:37:19 +01:00
Daniel Lee e4f4cb814c Merge branch 'master' into azure-monitor 2019-01-28 19:23:34 +01:00
Marcus Efraimsson f09c4608c2 changelog: add notes about closing #13711 2019-01-28 18:35:48 +01:00
Marcus Efraimsson ed6cca61c9 Merge pull request #15051 from ellisvlad/13711_parse_database_config_ipv6_host
Parse database host correctly when using IPv6
2019-01-28 18:32:09 +01:00
Marcus Efraimsson 577f35f6ba changelog: add notes about closing #5699 2019-01-28 18:24:13 +01:00
Marcus Efraimsson f701c610fb Merge pull request #15054 from RangerRick/master
add global datasource proxy timeout setting
2019-01-28 18:21:27 +01:00
Torkel Ödegaard c3c8cd3f4d Fix for annotations not clearing when switching dashboards, fixes #15063 2019-01-28 18:19:12 +01:00
Torkel Ödegaard 8510f0cd11 Merge pull request #15084 from grafana/fix/explore-datasource-change
Update datasource before the loading has started
2019-01-28 17:55:33 +01:00
Torkel Ödegaard a7b486d998 Merge pull request #15040 from grafana/14807-enable-webit-scrollbar-styles
Re-enable webit-prefixed scrollbar styles
2019-01-28 17:51:39 +01:00
Torkel Ödegaard adf08bf222 Merge pull request #15098 from xlson/build-dont-push-latest
build: ignore latest
2019-01-28 17:49:47 +01:00
Dominik Prokop 44a7bd68be Import fix 2019-01-28 17:46:42 +01:00
Torkel Ödegaard 2bed762950 Merge pull request #15097 from benjamingorman/feature/grammar-fixes
Spelling/grammar fixes in top level markdown files
2019-01-28 17:37:34 +01:00
Dominik Prokop 7a8eb8c115 Merge branch 'master' into tooling/storybook-poc 2019-01-28 17:36:41 +01:00
Torkel Ödegaard 6d9246d447 Merge pull request #15093 from grafana/fix/explore-do-not-clear-results
Do not clear query results on transaction start
2019-01-28 17:17:13 +01:00
Torkel Ödegaard fd06e51776 Merge branch 'master' into fix/explore-do-not-clear-results 2019-01-28 17:16:39 +01:00
Torkel Ödegaard 50b140f6ce Merge pull request #15082 from bergquist/explore_by_default
enables explore by default
2019-01-28 17:09:17 +01:00
Leonard Gram 584c97320a build: ignore latest 2019-01-28 17:08:27 +01:00
Torkel Ödegaard ca68a88ee1 Merge pull request #14914 from grafana/named-colors
Named colors picker
2019-01-28 17:08:26 +01:00
Torkel Ödegaard 5768593da7 Merge pull request #15095 from grafana/hugoh/bug-inifinite-loop-when-scan-for-older-logs-clicked
Making sure we do not pass a long invalid queries and save to state
2019-01-28 17:01:24 +01:00
Ben Gorman d56d9a0c12 Spelling/grammar fixes in top level markdown files 2019-01-28 15:58:32 +00:00
Leonard Gram 55f2495afa build: publishes armv6 to grafana.com.
Stops using the old publisher completely.

Closes #13008
2019-01-28 16:33:24 +01:00
Torkel Ödegaard a1a905cbb1 Removed the initial data source as I could not see it being used anywhere 2019-01-28 16:31:38 +01:00
Dominik Prokop 00cb751eab Merge branch 'named-colors' of github.com:grafana/grafana into named-colors 2019-01-28 15:54:58 +01:00
Dominik Prokop 9a08a994f4 Initialize named colors palete lazily 2019-01-28 15:49:59 +01:00
Dominik Prokop 053d4060e8 Fix thresholds default colors not being applied 2019-01-28 15:48:54 +01:00
bergquist 21fff415ed removes unnessecary db request 2019-01-28 15:37:52 +01:00
Hugo Häggmark 08f5a3338a Making sure we do not pass a long invalid queries and save to state 2019-01-28 15:27:35 +01:00
Torkel Ödegaard 91d926f180 single import for types from @grafana/ui 2019-01-28 15:27:23 +01:00
bergquist 935da14f7d tab/spaces formatting 2019-01-28 15:27:02 +01:00
Torkel Ödegaard 2c9a867bde Merge branch 'master' into fix/explore-datasource-change 2019-01-28 15:24:14 +01:00
Marcus Efraimsson 6584ca20d2 Merge branch 'master' into 8570-mysql-ssl-datasource 2019-01-28 15:12:33 +01:00
Torkel Ödegaard 2dc2471b5c Revert "Updated home dashboard, removed home dashboard header"
This reverts commit 0151846e1e.
2019-01-28 15:01:42 +01:00
Torkel Ödegaard 994c79b59b Merge branch '15048/navigate-from-not-saved-panel' 2019-01-28 14:45:49 +01:00
Torkel Ödegaard 520756fb4c Fixed wrong line in test 2019-01-28 14:44:35 +01:00
Hugo Häggmark dc125f1e4d Made sure we only resetTypeahead if mounted 2019-01-28 14:43:59 +01:00
bergquist 6a8643b3d1 Merge branch 'master' into configurable-alert-notification
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
2019-01-28 14:16:43 +01:00
Dominik Prokop d947748dd4 Delayed explore query loading indicator and implemented minor ux improvements to it 2019-01-28 14:07:45 +01:00
Peter Holmberg d433a4792a fixing test 2019-01-28 14:07:37 +01:00
bergquist 48aa173f67 support both uid and id for showing/removing notifiers 2019-01-28 14:00:55 +01:00
David edfce0893e Merge pull request #15090 from grafana/hugoh/bug-explore-cant-go-from-dashboard-to-explore
Fixed reinitialise of Explore
2019-01-28 13:43:32 +01:00
Dominik Prokop 07331b4c07 Revert "Use the same panel loading indicator in explore as on dashboard's panel"
This reverts commit 05edb3e5ad.
2019-01-28 13:40:41 +01:00
Hugo Häggmark 6b0400eed2 Firing off an action instead of listening to location changes 2019-01-28 13:27:56 +01:00
Dominik Prokop 957c659291 Handle undefined graph and table results 2019-01-28 13:09:51 +01:00
bergquist 6e672eb291 enable explore by default
closes #15037
2019-01-28 13:02:54 +01:00
Dominik Prokop 05edb3e5ad Use the same panel loading indicator in explore as on dashboard's panel 2019-01-28 12:58:10 +01:00
Dominik Prokop 2ff62c42ac Prevents query result cleaning when new query trransaction starts 2019-01-28 12:57:09 +01:00
Hugo Häggmark 9298876ef0 Changes after PR Comments 2019-01-28 12:47:01 +01:00
Hugo Häggmark 1e6d50df7a Made ExplorerToolbar connected and refactored away responsabilities from Explore 2019-01-28 12:47:01 +01:00
Hugo Häggmark 21df0c90a9 Removed some split complexity 2019-01-28 12:47:01 +01:00
Hugo Häggmark 0a094a13f2 Fixed some more styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark 18727dce23 Fixed close split look and feel 2019-01-28 12:47:01 +01:00
Hugo Häggmark 42f700054f Fixed position of Closesplit 2019-01-28 12:47:01 +01:00
Hugo Häggmark d2a5477654 Fixed small issue with TimePicker dropdown position 2019-01-28 12:47:01 +01:00
Hugo Häggmark 032a82feed Simplified some styles and dom elements 2019-01-28 12:47:01 +01:00
Hugo Häggmark 9caaf25078 Fixed some more with the sidemenu open and smaller screens 2019-01-28 12:47:01 +01:00
Hugo Häggmark b2c284e42c Fixed so heading looks good with closed sidemenu 2019-01-28 12:47:01 +01:00
Hugo Häggmark ffe03ee22d Restructure of component and styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark 1aefc4cc2d Refactored out ExploreToolbar from Explore 2019-01-28 12:47:01 +01:00
Peter Holmberg c9cab9b677 updating state if no panel 2019-01-28 12:20:16 +01:00
ijin08 b28e9b01fd updated the color palette 2019-01-28 11:52:36 +01:00
Hugo Häggmark 40f410562a Fixed reinitialise of Explore 2019-01-28 11:45:15 +01:00
Marcus Efraimsson c7e50a79d7 changelog: add notes about closing #13929 2019-01-28 11:29:50 +01:00
Marcus Efraimsson 5807fc1383 changelog: add notes about closing #14558 2019-01-28 11:20:23 +01:00
Marcus Efraimsson c52dde4c1b changelog: add notes about closing #14484 2019-01-28 11:18:37 +01:00
Marcus Efraimsson 4678f43aeb changelog: add notes about closing #13765 2019-01-28 11:15:00 +01:00
Marcus Efraimsson 2a0689a1f5 changelog: add notes about closing #11503 2019-01-28 11:08:16 +01:00
Marcus Efraimsson a9fd076470 changelog: add notes about closing #4075 2019-01-28 11:08:16 +01:00
Marcus Efraimsson 5869eba467 changelog: add notes about closing #14722 2019-01-28 11:08:16 +01:00
Marcus Efraimsson ec41c4a572 update changelog 2019-01-28 11:08:16 +01:00
Marcus Efraimsson ac17da624d changelog: add notes about closing #10322 2019-01-28 11:08:16 +01:00
Marcus Efraimsson 9eddb59705 changelog: add notes about closing #12991 2019-01-28 11:08:16 +01:00
Marcus Efraimsson 1d1d085b96 update changelog 2019-01-28 11:08:16 +01:00
Dominik Prokop 05f9eb0766 Update datasource before the loading has started 2019-01-28 11:06:50 +01:00
Torkel Ödegaard 642e1115f7 Merge pull request #15076 from grafana/minor-moving-task
Moving a few things from dashboard folder
2019-01-28 10:57:04 +01:00
Carl Bergquist 5082b66e3d Merge pull request #15078 from grafana/golang_1.11.5
upgrade golang to 1.11.5
2019-01-28 10:20:20 +01:00
Dominik Prokop 778ed912b8 Add cursor pointer to color swatches 2019-01-28 09:25:35 +01:00
Torkel Ödegaard de79c27bcb Fixed import path 2019-01-28 09:20:54 +01:00
bergquist 019848484b changelog: adds note about closing #14701 2019-01-28 08:35:14 +01:00
Carl Bergquist 711f9bc034 Merge pull request #14883 from sharkpc0813/14701-fix-alert-context
fix that alert context and result handle context do not use the same derived context.
2019-01-28 08:30:45 +01:00
bergquist 0cbc89b063 Merge branch 'master' into 14701-fix-alert-context
* master: (262 commits)
  pkg/services/dashboards/dashboard_service.go: simplify return
  Updated url query param encoding to exctly match angular encoding
  Updated snapshot
  Added missing props not being passed to scrollbar component, fixes #15058
  Document /api/health
  changelog: adds note for #15062
  change default rotate_token_minutes to 10 minutes
  fix
  load test/ha fixes
  set low login cookie rotate time in ha mode
  fix multiple piechart instances bug
  scripts/build/*: Fix some golint issues
  scripts/build/*: Fix golint issues Url => URL
  build: fixes building grafana completely within docker.
  dont specify domain for auth cookies
  New snapshot reflecting changes
  Makes the clickable side menu header look great in light theme again
  org id fix for load test
  user auth token load tests using k6.io
  moves cookie https setting to [security]
  ...
2019-01-28 08:09:52 +01:00
bergquist d75f53e895 upgrade golang to 1.11.5 2019-01-28 08:08:29 +01:00
bergquist 364154d81f moves timeout tests to an integration test 2019-01-28 07:56:31 +01:00
Carl Bergquist 87d44490e6 Merge pull request #15072 from mjtrangoni/fix-megacheck-issue
pkg/services/dashboards/dashboard_service.go: simplify return
2019-01-27 23:41:37 +01:00
Torkel Ödegaard 7f2c2a913e Moving a few things from dashboard folder 2019-01-27 17:33:13 +01:00
Vlad Ellis 9692955d4f Correct formatting of sqlstore_test.go 2019-01-27 16:28:02 +00:00
Mario Trangoni bf90ff87cf pkg/services/dashboards/dashboard_service.go: simplify return
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck  ./...
pkg/services/dashboards/dashboard_service.go:167:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2019-01-26 14:23:10 +01:00
Torkel Ödegaard 84d1ce8fe3 Merge pull request #15071 from grafana/explore-url-fixes
Updated url query param encoding to exctly match angular encoding
2019-01-26 12:41:32 +01:00
Torkel Ödegaard 0975f816aa Updated url query param encoding to exctly match angular encoding 2019-01-26 12:05:37 +01:00
Torkel Ödegaard 7956c74406 Merge pull request #15070 from grafana/scrollbar-fixes
Added missing props not being passed to scrollbar component
2019-01-26 11:48:48 +01:00
Torkel Ödegaard f3dc5381ee Merge pull request #15018 from miroswan/14961-constructor-as-rvalue
Bug Fix #14961
2019-01-26 11:11:32 +01:00
Torkel Ödegaard 27858c0272 Updated snapshot 2019-01-26 11:04:50 +01:00
Torkel Ödegaard c9d060c0fe Merge pull request #15041 from grafana/14752-explore-custom-scrollbar
Use CustomScrollbar in explore
2019-01-26 10:57:13 +01:00
Torkel Ödegaard 5e1a3c9ee2 Merge pull request #15023 from grafana/improve-organization
More file re-organization & clean-up
2019-01-26 10:53:09 +01:00
Torkel Ödegaard c748b53f17 Added missing props not being passed to scrollbar component, fixes #15058 2019-01-26 10:51:16 +01:00
Torkel Ödegaard ecbda1af23 Merge pull request #15068 from finkr/finkr-patch-doc-healthapi
Document /api/health
2019-01-26 07:06:03 +01:00
Torkel Ödegaard aaad9e3e49 Merge pull request #15057 from grafana/hugoh/sidemenu-dropdown-looks-funky-in-light-theme
Makes the clickable side menu header look great in light theme again
2019-01-26 07:05:28 +01:00
Vlad Ellis c208186f26 Parse database host correctly when using IPv6 2019-01-25 21:56:19 +00:00
Frank lin Piat 1fc5ea181a Document /api/health
Document the health check implemented in #3302 (and #935), see  https://github.com/grafana/grafana/issues/3302#issuecomment-297066201
2019-01-25 17:52:28 +01:00
Peter Holmberg 142ebc7546 some working solution, needs refactor 2019-01-25 16:38:51 +01:00
Daniel Lee d1608510ef changelog: adds note for #15062 2019-01-25 15:52:53 +01:00
Daniel Lee 684b588126 Merge pull request #15062 from alexanderzobnin/fix-piechart
fix multiple piechart instances bug
2019-01-25 15:38:23 +01:00
Dominik Prokop 07b9735263 Do not update color picker popover position on tab change
Position update caused tabs to move up and down. This led to confusing user experience, as tabs position was dependent on tab's content.
2019-01-25 14:07:22 +01:00
Carl Bergquist d5c1f8e526 Merge pull request #14912 from grafana/poc_token_auth
WIP. POC for session replacement base hashed tokens.
2019-01-25 13:58:35 +01:00
Marcus Efraimsson e4924795a2 change default rotate_token_minutes to 10 minutes 2019-01-25 13:30:26 +01:00
Dominik Prokop 5f41c5ca5e Rename deprecation warning helper 2019-01-25 13:30:02 +01:00
Dominik Prokop 3c60f98d13 Implemented tests for ColorPickerPopover and NamedColorsPalette 2019-01-25 13:24:20 +01:00
Marcus Efraimsson 42fa41e78d fix 2019-01-25 13:18:17 +01:00
Marcus Efraimsson 806ddd63a0 load test/ha fixes 2019-01-25 13:16:19 +01:00
bergquist 95d9328c66 set low login cookie rotate time in ha mode 2019-01-25 12:59:50 +01:00
Dominik Prokop e75b0a3c70 Fix light theme issues with named colors disabled 2019-01-25 12:13:36 +01:00
Dominik Prokop f01441f4a7 Stories cleanup 2019-01-25 12:03:42 +01:00
Alexander Zobnin 7fb1b3a11a fix multiple piechart instances bug 2019-01-25 13:56:00 +03:00
Mario Trangoni 4b68055c16 scripts/build/*: Fix some golint issues
See,

$ gometalinter --vendor --disable-all --enable=golint ./...
build/release_publisher/externalrelease.go:55:6⚠️ type getHttpContents should be getHTTPContents (golint)
build/release_publisher/publisher.go:18:2⚠️ struct field apiUri should be apiURI (golint)
build/release_publisher/publisher.go:66:6⚠️ exported type ReleaseType should have comment or be unexported (golint)
build/release_publisher/publisher.go:69:2⚠️ exported const STABLE should have comment (or a comment on this block) or be unexported (golint)
build/release_publisher/publisher.go:185:16⚠️ should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) (golint)
build/release_publisher/publisher_test.go:102:6⚠️ type mockHttpGetter should be mockHTTPGetter (golint)
2019-01-25 11:21:47 +01:00
Mario Trangoni d5f63d9988 scripts/build/*: Fix golint issues Url => URL
$ gometalinter --vendor --disable-all --enable=golint ./... | grep -i URL
build/publish.go:18:5⚠️ var apiUrl should be apiURL (golint)
build/publish.go:184:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/publish.go:185:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/publish.go:191:2⚠️ struct field Url should be URL (golint)
build/release_publisher/externalrelease.go:17:53⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/externalrelease.go:17:69⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/externalrelease.go:17:89⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:20:45⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:20:61⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/localrelease.go:20:81⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:45:41⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:51:84⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/main.go:12:6⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/main.go:13:6⚠️ var releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/main.go:40:6⚠️ var baseUrl should be baseURL (golint)
build/release_publisher/main.go:94:6⚠️ func createBaseUrl should be createBaseURL (golint)
build/release_publisher/publisher.go:21:2⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:17⚠️ interface method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:33⚠️ interface method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:26:53⚠️ interface method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:29:31⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:29:51⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:91:24⚠️ method getUrl should be getURL (golint)
build/release_publisher/publisher.go:91:31⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:190:15⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:199:21⚠️ method apiUrl should be apiURL (golint)
build/release_publisher/publisher.go:257:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/release_publisher/publisher.go:258:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/release_publisher/publisher.go:264:2⚠️ struct field Url should be URL (golint)
build/release_publisher/publisher_test.go:10:3⚠️ struct field whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:11:3⚠️ struct field relNotesUrl should be relNotesURL (golint)
build/release_publisher/publisher_test.go:17:3⚠️ struct field expectedUrl should be expectedURL (golint)
build/release_publisher/publisher_test.go:18:3⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher_test.go:109:2⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:110:2⚠️ var relNotesUrl should be relNotesURL (golint)
2019-01-25 11:21:47 +01:00
Leonard Gram 674ab73806 build: fixes building grafana completely within docker.
Fixes #15060
2019-01-25 10:52:47 +01:00
bergquist 75760aa892 dont specify domain for auth cookies 2019-01-25 10:40:50 +01:00
Alexander Zobnin 96ffa9d797 monaco-kusto: fix imports 2019-01-25 11:23:46 +03:00
Alexander Zobnin 0dc6e86b3b use @alexanderzobnin/monaco-kusto package for kusto syntax highlight 2019-01-25 11:15:18 +03:00
bergquist b5572b23b6 Merge branch 'master' into poc_token_auth
* master: (32 commits)
  Fixed react key warning for loki start page
  Disable query should trigger refresh
  added docs entry for check_for_updates config flag, fixes ##14940
  Explore: Fix scanning for logs
  Moved ad hoc filters and upload directive
  Moved dashboard srv and snapshot ctrl
  Moved share modal
  Moved dashboard save modals to components folder
  Moved unsaved changes service and modal
  Removed unused alertingSrv
  Moved view state srv to services
  Moved timepicker to components
  Moved submenu into components dir
  Moved dashboard settings to components
  Moved dashboard permissions into components dir
  Moved history component, added start draft of frontend code style guide
  fix: Use custom whitelist for XSS sanitizer to allow class and style attributes
  Began work on improving structure and organization of components under features/dashboard, #14062
  Fix a typo in changelog
  Update ROADMAP.md
  ...
2019-01-25 08:28:24 +01:00
Hugo Häggmark bd745959d2 New snapshot reflecting changes 2019-01-25 06:49:15 +01:00
Hugo Häggmark 72a0ba29f5 Makes the clickable side menu header look great in light theme again 2019-01-25 06:44:32 +01:00
Marcus Efraimsson cfd8bd711b org id fix for load test 2019-01-24 23:49:45 +01:00
Marcus Efraimsson 6454de74e4 user auth token load tests using k6.io 2019-01-24 22:47:53 +01:00
Benjamin Reed 9108fd1b9d add global datasource proxy timeout setting
closes grafana#5699
2019-01-24 14:06:48 -05:00
bergquist d6edaa1328 moves cookie https setting to [security] 2019-01-24 19:04:58 +01:00
Alexander Zobnin 00de497663 Azure Monitor: build monaco with webpack WIP 2019-01-24 18:43:48 +03:00
Dominik Prokop 5032c74b79 Use Switch to control y-axis in series color picker 2019-01-24 15:36:28 +01:00
Dominik Prokop 1d3122632f Move Switch component to grafana-ui 2019-01-24 15:35:50 +01:00
bergquist 9153b6ed96 improves readability of loginping handler 2019-01-24 15:17:09 +01:00
Demitri Swan 186e488ace Bug Fix #14961 2019-01-24 14:11:31 +00:00
ijin08 ce440b85fc minor styling changes to gaps, font-size and width 2019-01-24 14:39:52 +01:00
bergquist 516037fbdd makes sure rotation is always higher than urgent rotation 2019-01-24 13:54:45 +01:00
bergquist 9ae306e417 use defer to make sure we always release session data 2019-01-24 13:48:36 +01:00
Dominik Prokop 8d8f944a1f Enable custom picers on color color picker popovers (for y-axis support in legend picker) 2019-01-24 13:18:21 +01:00
Johannes Schill 2706f09de8 feat: Use CustomScrollbar in explore #14752 2019-01-24 12:59:12 +01:00
Johannes Schill cf44c0cf87 chore: Better comment 2019-01-24 12:51:11 +01:00
Johannes Schill a91037fb50 chore: Remove comment and unneeded export 2019-01-24 12:43:25 +01:00
Johannes Schill 45fc9c1860 fix: Enable -webkit-scrollbar related css when there's no overlay scrollbar #14807 2019-01-24 12:43:25 +01:00
bergquist fd0f9f2dd2 fixes broken test 2019-01-24 12:06:44 +01:00
Dominik Prokop 40dc29d135 Make series overrides color picker display correctly 2019-01-24 12:01:15 +01:00
bergquist f257101c41 removes unused/commented code 2019-01-24 11:26:45 +01:00
bergquist ff483f3782 removes old cookie auth configuration 2019-01-24 10:55:10 +01:00
bergquist 56a521b264 makes auth token rotation time configurable 2019-01-24 10:50:18 +01:00
Dominik Prokop 1e69a7b8b7 Update story for NamedColorsPalette 2019-01-24 10:37:53 +01:00
Dominik Prokop d414e463bd Update imports of NamedColorsPalette 2019-01-24 10:37:34 +01:00
Dominik Prokop 549e0993c4 Restore missing styles 2019-01-24 10:28:48 +01:00
Dominik Prokop 071b1f8478 Fixed issue with color name retrieval not being aware of current theme 2019-01-24 09:56:52 +01:00
Torkel Ödegaard 05738258bb Fixed dashboard import issue after move 2019-01-24 09:47:06 +01:00
Torkel Ödegaard e713b0f029 Moved add panel panel and renamed it to add panel widget 2019-01-24 09:23:48 +01:00
Torkel Ödegaard c7b556c0e4 Merge pull request #15017 from grafana/explore-fixes
Fixed react key warning for loki start page
2019-01-23 22:02:21 +01:00
Torkel Ödegaard 6419a30377 Fixed react key warning for loki start page 2019-01-23 21:19:42 +01:00
Torkel Ödegaard 11c306abde Moved row options to it's own component folder 2019-01-23 20:29:05 +01:00
Torkel Ödegaard adacdf98b7 Removed old query inspector (that was opened by clickin error in panel title)
think the new query insector from Queries tab can replace this old one.
2019-01-23 20:26:18 +01:00
Torkel Ödegaard 9d5560afe2 Moving files to better locations 2019-01-23 20:21:07 +01:00
Torkel Ödegaard b5bc69253f Merge pull request #15016 from grafana/fix-disable-query
Disable query should trigger refresh
2019-01-23 20:03:35 +01:00
Torkel Ödegaard 81981cf45d Merge pull request #15014 from grafana/docs-fix-updates-flag
added docs entry for check_for_updates config flag,
2019-01-23 19:35:12 +01:00
Torkel Ödegaard b1ef3c43f9 Disable query should trigger refresh 2019-01-23 19:34:56 +01:00
Torkel Ödegaard d88b7608a5 Merge pull request #15013 from grafana/revert-11635-patch-1
Revert "Specify expected encoding for access/secret key"
2019-01-23 18:26:35 +01:00
Torkel Ödegaard 05a976fdb1 added docs entry for check_for_updates config flag, fixes ##14940 2019-01-23 18:24:57 +01:00
Torkel Ödegaard 02083d71c8 Loki query editor is starting to work, had to make changes to explore query field in order to update query from the outside without unmount between 2019-01-23 17:44:22 +01:00
bergquist 4626f083bb store oauth login error messages in an encrypted cookie 2019-01-23 17:01:09 +01:00
Dominik Prokop d13efb3372 Removed sass import of spectrum.scss 2019-01-23 16:37:23 +01:00
ijin08 7bdbe3ea9d Merge branch 'named-colors' of github.com:grafana/grafana into named-colors 2019-01-23 16:25:51 +01:00
ijin08 387c40c6d2 replaced palette colors with current palette adjusted for dark and light theme 2019-01-23 16:23:48 +01:00
Dominik Prokop 573e64ef11 Remove spectrum.js vendor dependency from grafana/ui 2019-01-23 16:02:21 +01:00
ijin08 30f27a966b changed light-theme tool-tip to be a bit lighter, trying different paddings 2019-01-23 15:39:13 +01:00
Torkel Ödegaard d420024178 Merge pull request #15009 from grafana/davkal/14997-fix-scanner
Explore: Fix scanning for logs
2019-01-23 15:35:31 +01:00
Torkel Ödegaard 3dca65c6b8 Merge pull request #14958 from aocenas/refresh-playlist-counter
Add loop counter for full refresh in playlist
2019-01-23 15:34:49 +01:00
Dominik Prokop 580b919424 Fix hide timeout for color picker 2019-01-23 15:34:39 +01:00
Dominik Prokop e5f74fdf93 Rename colorsPalette util to namedColorsPalette 2019-01-23 15:31:41 +01:00
Dominik Prokop 511895c079 Make small swatches react to theme changes 2019-01-23 15:30:33 +01:00
bergquist df85cc9bb1 redirect logged in users from /login to home 2019-01-23 15:28:33 +01:00
David Kaltschmidt c0277ab595 Explore: Fix scanning for logs
- Redux migration caused the scanner to not be set
- this change adds the setting/unsetting of the scanner in the reducer
- added test
2019-01-23 15:05:54 +01:00
Dominik Prokop 3c7a5bdf7b Update styles of selected named color swatch 2019-01-23 14:59:43 +01:00
bergquist 5998646da5 restrict session usage to auth_proxy 2019-01-23 14:56:48 +01:00
Dominik Prokop 8cce80a851 Implement pointer component for spectrum palette sliders 2019-01-23 14:46:38 +01:00
Torkel Ödegaard 90787a5299 Merge pull request #14999 from grafana/dashboard-component-organization
WIP: Re-organize components under features/dashboard
2019-01-23 14:00:03 +01:00
Torkel Ödegaard 8a9582dad5 minor updates 2019-01-23 13:54:34 +01:00
Dominik Prokop ab7756ecb4 Make default color picker close on trigger mouse leave 2019-01-23 13:46:13 +01:00
Torkel Ödegaard f0eef79c1a Moved ad hoc filters and upload directive 2019-01-23 13:31:45 +01:00
Dominik Prokop 53f52a67e1 Added deprecation warning to old color picker API props. Moved named color support handling to color popovers 2019-01-23 13:29:56 +01:00
ijin08 2ec55d0650 changed color for label tooltips from blue/red-yellow gradient to black/white 2019-01-23 13:28:39 +01:00
Torkel Ödegaard 2f08c56260 Moved dashboard srv and snapshot ctrl 2019-01-23 13:10:49 +01:00
Torkel Ödegaard 80da19010e Moved share modal 2019-01-23 13:07:20 +01:00
Torkel Ödegaard 720fa87b89 Moved dashboard save modals to components folder 2019-01-23 13:00:05 +01:00
Torkel Ödegaard 4358732d21 Moved unsaved changes service and modal 2019-01-23 12:52:46 +01:00
Torkel Ödegaard a4824085e3 Removed unused alertingSrv 2019-01-23 12:09:58 +01:00
Torkel Ödegaard d9f11fa658 Merge pull request #15005 from grafana/xss-filter-allow-class-style
XSS sanitizer allows class and style attributes
2019-01-23 12:06:57 +01:00
Torkel Ödegaard 874792dfcb Moved view state srv to services 2019-01-23 12:02:47 +01:00
Torkel Ödegaard ec37f84727 Moved timepicker to components 2019-01-23 11:55:52 +01:00
Torkel Ödegaard 2356057f20 Moved submenu into components dir 2019-01-23 11:51:43 +01:00
Torkel Ödegaard 08f7e55ae5 Moved dashboard settings to components 2019-01-23 11:48:27 +01:00
Torkel Ödegaard dfe9252f54 Moved dashboard permissions into components dir 2019-01-23 11:45:23 +01:00
Torkel Ödegaard 0c16d3cd6a Moved history component, added start draft of frontend code style guide 2019-01-23 11:37:46 +01:00
Johannes Schill 5c72e4e668 fix: Use custom whitelist for XSS sanitizer to allow class and style attributes 2019-01-23 11:27:02 +01:00
Carl Bergquist 766122856b Merge pull request #14995 from bergquist/token_oauth
Stores hashed state code in cookie for OAuth logins.
2019-01-23 10:39:12 +01:00
Dominik Prokop 5c5265829a Reduce padding in color picker popover 2019-01-23 09:39:59 +01:00
Torkel Ödegaard 26385dea8f Began work on improving structure and organization of components under features/dashboard, #14062 2019-01-22 21:36:36 +01:00
Torkel Ödegaard 909d89077d Merge pull request #14998 from roidelapluie/patch-1
Fix a typo in changelog
2019-01-22 21:14:11 +01:00
Julien Pivotto 2bdc92f7dd Fix a typo in changelog 2019-01-22 20:42:56 +01:00
Dominik Prokop 9fd9bba1f4 Implemented new spectrum palette 2019-01-22 20:00:22 +01:00
Torkel Ödegaard 2264c27504 Merge pull request #14989 from grafana/hugoh/bug-folder-name-appears-misleadingly-when-using-viewers-can-edit
fixes:#14282 - Do not change folder for persisted dashboards
2019-01-22 17:47:12 +01:00
Torkel Ödegaard 3a390a994b Update ROADMAP.md 2019-01-22 17:46:38 +01:00
Torkel Ödegaard 2a50777001 use resetfolder instead so it shows current folder 2019-01-22 17:41:36 +01:00
Torkel Ödegaard 0151846e1e Updated home dashboard, removed home dashboard header 2019-01-22 17:23:24 +01:00
Torkel Ödegaard 5d3ef4e500 Merge pull request #14992 from grafana/hugoh/bug-explore-toggle-table-does-not-work
fix: Dispatch the correct action (#14985)
2019-01-22 16:43:36 +01:00
bergquist c3ff3d644c fixes nil ref in tests 2019-01-22 16:16:32 +01:00
Torkel Ödegaard db99b86591 Merge pull request #12765 from cxcv/master
added percentencode formatting option
2019-01-22 15:55:36 +01:00
bergquist 31b5db06f1 Merge branch 'master' into poc_token_auth
* master: (156 commits)
  Fixed issues with the sanitizie input in text panels, added docs, renamed config option
  build: removes arm32v6 docker image.
  Updated version in package.json to 6.0.0-pre1
  Update CHANGELOG.md
  build: armv6 docker image.
  build: skips building rpm for armv6.
  build: builds for armv6.
  Explore: mini styling fix for angular query editors
  Removed unused props & state in PromQueryField
  chore: Remove logging and use the updated config param
  chore: Reverse sanitize variable so it defaults to false
  feat: wip: Sanitize user input on text panel
  fix: Text panel should re-render when panel mode is changed #14922
  Minor rename of LogsProps and LogsState
  Splitted up LogLabels into LogLabelStats and LogLabel
  Refactored out LogRow to a separate file
  Removed strange edit
  Added link to side menu header and fixed styling
  Moved ValueMapping logic and tests to separate files
  Fixed data source selection in explore
  ...
2019-01-22 15:39:54 +01:00
bergquist 64124b5042 add setting for how to long we should keep expired tokens 2019-01-22 15:31:43 +01:00
bergquist 12f8338977 stores hashed state code in cookie 2019-01-22 15:22:24 +01:00
bergquist d3ec8e1ccb creates new config section for login settings 2019-01-22 15:22:11 +01:00
Benjamin Schweizer bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Hugo Häggmark 85838a40d6 fix: Dispatch the correct action (#14985) 2019-01-22 13:59:58 +01:00
Marcus Efraimsson 59d0c19ba8 passing middleware tests 2019-01-22 13:51:55 +01:00
Dominik Prokop ba4b774c96 Stories update for color picker 2019-01-22 13:36:21 +01:00
Dominik Prokop c3e5737fb8 Make named colors optional in color picker, enable named colors in graph legend series picker 2019-01-22 13:35:57 +01:00
Dominik Prokop 5b63ee4bfb Storybook - add actions addon 2019-01-22 13:19:47 +01:00
Hugo Häggmark 151b838f0b fixes:#14282 - Do not change folder for persisted dashboards 2019-01-22 13:07:03 +01:00
Torkel Ödegaard 75e3d90089 Merge pull request #14988 from grafana/sanitize-input-fixes
Fixed issues with the sanitizie input in text panels
2019-01-22 12:26:51 +01:00
Marcus Efraimsson 4096449aec extract auth token interface and remove auth token from context 2019-01-22 12:00:33 +01:00
Torkel Ödegaard f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Leonard Gram caa9a90bfd build: removes arm32v6 docker image. 2019-01-22 11:44:02 +01:00
Torkel Ödegaard 39fa0aec5d Updated version in package.json to 6.0.0-pre1 2019-01-22 11:37:14 +01:00
Torkel Ödegaard cd3157fa68 Update CHANGELOG.md 2019-01-22 11:36:38 +01:00
Torkel Ödegaard cfdef66f8c Merge pull request #14984 from grafana/4117-xss-sanitize-text-panels
XSS sanitize text panels
2019-01-22 11:29:50 +01:00
Torkel Ödegaard bc7842e324 Merge pull request #14972 from grafana/hugoh/rendering-null-as-valuemapping
Added check for null value in ValueMappings and added tests
2019-01-22 11:28:44 +01:00
Benjamin Schweizer 8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Leonard Gram ec11d5a90a build: armv6 docker image. 2019-01-22 11:09:27 +01:00
Leonard Gram 2bdc147e55 build: skips building rpm for armv6. 2019-01-22 11:09:27 +01:00
Leonard Gram 5f188058e3 build: builds for armv6. 2019-01-22 11:09:27 +01:00
Dominik Prokop dd8f7aa7a9 CustomScrollbar - expose underlying's react-custom-scrollbars API to allow scroll tracks config.
Updated config for Graph legend not to display horizontal scroll track which caused legend being not accessible in ceertain situations (e.g. when native OS scroll overlay disabled)
2019-01-22 10:58:31 +01:00
Torkel Ödegaard e43fafd96e Explore: mini styling fix for angular query editors 2019-01-22 10:46:21 +01:00
Torkel Ödegaard a03faba9a3 Merge pull request #14983 from grafana/hugoh/logs-refactoring
Logs refactoring
2019-01-22 10:32:05 +01:00
Torkel Ödegaard 40b73a1fcd Removed unused props & state in PromQueryField 2019-01-22 09:57:27 +01:00
Torkel Ödegaard e8e1d35340 Merge pull request #14981 from grafana/hugoh/sidemenu-should-be-clickable
Added link to side menu header and fixed styling
2019-01-22 09:36:58 +01:00
Johannes Schill 08dc5a4f97 chore: Remove logging and use the updated config param 2019-01-22 09:36:07 +01:00
Johannes Schill 1ed35f3dc1 chore: Reverse sanitize variable so it defaults to false 2019-01-22 09:36:07 +01:00
Johannes Schill 15d560a1c0 feat: wip: Sanitize user input on text panel 2019-01-22 09:36:07 +01:00
Johannes Schill a3e13b333e fix: Text panel should re-render when panel mode is changed #14922 2019-01-22 09:36:07 +01:00
Torkel Ödegaard 5446f49f19 Merge pull request #14977 from grafana/explore-fix-datasource-selector
Fixed data source selection in explore
2019-01-22 09:36:02 +01:00
Hugo Häggmark bcb3824e6a Minor rename of LogsProps and LogsState 2019-01-22 09:25:40 +01:00
Hugo Häggmark c369279401 Splitted up LogLabels into LogLabelStats and LogLabel 2019-01-22 09:22:38 +01:00
Dominik Prokop d86d063900 Make popover hide delay configurable to enable better UX 2019-01-22 09:14:30 +01:00
Dominik Prokop 2b34933554 Stories - fix import 2019-01-22 09:14:30 +01:00
Dominik Prokop 93bb30a561 Enable new color picker in Gauge and Thresholds editor, use ThemeProvider instead of ContextSrv 2019-01-22 09:14:30 +01:00
Dominik Prokop ed48ecfe1d Updated table tests to new behavior for colors (values are always rendered as hex/rgb) 2019-01-22 09:11:30 +01:00
Dominik Prokop 84caf0bc9d Make named colors usable in angular code pt 1 2019-01-22 09:11:30 +01:00
Dominik Prokop 597cbb5b9b Story updates 2019-01-22 09:11:30 +01:00
Dominik Prokop b560dcac3d Update grafana/ui exports 2019-01-22 09:11:30 +01:00
Dominik Prokop a214b5748e Refactor color picker to remove code duplicartion (introduced colorPickerFactory). Allow popver position update on content change 2019-01-22 09:11:30 +01:00
Dominik Prokop 4f516faa82 Fix lint 2019-01-22 09:11:30 +01:00
Dominik Prokop 25e60565ad Updated stories 2019-01-22 09:11:30 +01:00
Dominik Prokop c8ac23f3c1 Rendering arrows for color picker, applying color changes to time series 2019-01-22 09:11:30 +01:00
Dominik Prokop e35e266c81 Fix TS errors 2019-01-22 09:11:30 +01:00
Dominik Prokop b02c89c3ba Stories updates 2019-01-22 09:11:30 +01:00
Dominik Prokop e33614ade3 Unified color picker API, allowed for color specified for theme selection, updated code to changes in PopperController API 2019-01-22 09:11:30 +01:00
Dominik Prokop 977d53c8c9 Get rid of unused renderContent prop on PopperController 2019-01-22 09:11:30 +01:00
Dominik Prokop 0505add7f6 Enabled knobs for storybook and implemented some stories 2019-01-22 09:11:30 +01:00
Dominik Prokop 3d2955f24f Lint fix 2019-01-22 09:11:30 +01:00
Dominik Prokop 5420a816e7 Render series color picker with correct theme 2019-01-22 09:11:30 +01:00
Dominik Prokop 4b9e933691 Added config provider to be able to access config easily from react components 2019-01-22 09:11:30 +01:00
Dominik Prokop 33fa40a1f3 Migrating color pickers to Popper from drop.js pt1 2019-01-22 09:11:30 +01:00
Dominik Prokop c74b39696c Updates to Popper to be positions correctly within window 2019-01-22 09:11:30 +01:00
Dominik Prokop 4384eb2f0b Move tooltip themes to Tooltip component making Popper/PopperController theme agnostic 2019-01-22 09:11:30 +01:00
Dominik Prokop ac37879016 WIP Basics of named color picker 2019-01-22 09:11:30 +01:00
Dominik Prokop 7ad430a6be Merge branch 'master' into tooling/storybook-poc 2019-01-22 09:11:07 +01:00
Hugo Häggmark 23202ab130 Refactored out LogRow to a separate file 2019-01-22 08:59:22 +01:00
Hugo Häggmark bf0333e329 Removed strange edit 2019-01-22 08:18:03 +01:00
Hugo Häggmark a6428fef0c Added link to side menu header and fixed styling 2019-01-22 08:12:48 +01:00
Hugo Häggmark a9c33ab658 Moved ValueMapping logic and tests to separate files 2019-01-22 06:40:04 +01:00
Marcus Efraimsson 366e356e08 more auth token tests 2019-01-21 21:48:18 +01:00
Torkel Ödegaard 9c8dea062a Merge pull request #14975 from grafana/default-datasource-query-editor
Fix for default datasource query editor
2019-01-21 21:43:01 +01:00
Torkel Ödegaard 79bd7f4077 Fixed data source selection in explore 2019-01-21 21:36:30 +01:00
Torkel Ödegaard 018fef0400 Added refId to missing queries on panel model init 2019-01-21 20:35:24 +01:00
bergquist 777bd9ea18 adds cleanup job for old session tokens 2019-01-21 19:03:32 +01:00
Torkel Ödegaard db2a15daf0 Fixed loading of default query editor 2019-01-21 18:54:57 +01:00
Hugo Häggmark bbb7596113 Changed null logic for range value mappings after PR comments 2019-01-21 17:30:47 +01:00
Marcus Efraimsson f040f9a400 fix tests after renaming now 2019-01-21 16:53:00 +01:00
Hugo Häggmark 38ea11d110 Added check for null value in ValueMappings and added tests 2019-01-21 16:07:55 +01:00
Marcus Efraimsson 38efc1d7d2 s/print/log 2019-01-21 15:53:40 +01:00
bergquist 92620af75f avoid calling now() multiple times 2019-01-21 15:48:17 +01:00
Marcus Efraimsson dd8476d81a passing auth token tests 2019-01-21 15:06:33 +01:00
Torkel Ödegaard 96d28703f7 Merge pull request #14963 from grafana/hugoh/bug-viewers-can-edit-not-working-for-explore
Viewers can edit now means that viewers have access to Explore
2019-01-21 13:51:46 +01:00
Torkel Ödegaard 721e40db90 fixed trailing whitespace 2019-01-21 13:51:33 +01:00
Torkel Ödegaard c188a44ba8 Merge pull request #14969 from grafana/gotmetalinter-script
Gometalinter changes & megacheck fix
2019-01-21 13:49:35 +01:00
Torkel Ödegaard 778e1f78c2 Merge branch 'master' into hugoh/bug-viewers-can-edit-not-working-for-explore 2019-01-21 13:31:05 +01:00
Marcus Efraimsson 565408194a handle expired tokens 2019-01-21 13:22:20 +01:00
Torkel Ödegaard 829e3024ce fixed circleci script run path for gometalinter 2019-01-21 13:20:24 +01:00
Torkel Ödegaard f24e6ebf67 Fixed circleci name for gometalinter exec step 2019-01-21 13:10:00 +01:00
Torkel Ödegaard 37e917939a moved script and added exit_if_fail 2019-01-21 13:07:28 +01:00
Torkel Ödegaard d5e49845f3 Moved gometalinter to a script instead of seperate commands in circleci file, removed megacheck and added staticcheck 2019-01-21 13:03:05 +01:00
Dominik Prokop c8ec35ce1f Merge branch 'master' into tooling/storybook-poc 2019-01-21 12:20:10 +01:00
bergquist 697ddccd8e set userToken on request when logging in 2019-01-21 11:42:10 +01:00
bergquist 55b3013eb3 moves initWithToken to auth package 2019-01-21 11:37:44 +01:00
Marcus Efraimsson 734a7d38b2 set cookie name from configuration 2019-01-21 11:21:43 +01:00
Hugo Häggmark b95650d19c Added function hasAccessToExplore in ContextSrv and refactored tests 2019-01-21 10:50:34 +01:00
Marcus Efraimsson 766cfab374 change rotate time 2019-01-21 10:22:18 +01:00
Marcus Efraimsson 0d1e3759eb mixor fixes 2019-01-21 10:20:23 +01:00
Marcus Efraimsson f3125b447b dead code 2019-01-21 10:20:23 +01:00
Marcus Efraimsson 0495499b4f fix ip address parsing of loopback address 2019-01-21 10:20:23 +01:00
bergquist 2e97d39abe removes commented code 2019-01-21 10:01:48 +01:00
bergquist 47a7d93fd9 moves rotation into auth since both happens before c.Next() 2019-01-21 08:59:01 +01:00
Hugo Häggmark 9d6ac2c3d4 fix: Viewers can edit means that viewers have acces to Explore #14281 2019-01-21 08:47:41 +01:00
Andrej Ocenas 382a12c0fd Add loop counter for full refresh in playlist 2019-01-19 16:58:26 +01:00
Torkel Ödegaard d843044841 decreased panel height in edit mode 2019-01-19 08:31:20 +01:00
Torkel Ödegaard f94a6b2431 Merge pull request #14956 from grafana/query-editor-row-style-update
Query editor row style update & sass cleanup
2019-01-19 08:24:28 +01:00
Torkel Ödegaard 17aebf8462 Merge pull request #14955 from grafana/datasource-typings
Datasource typings
2019-01-19 08:24:06 +01:00
Torkel Ödegaard 4cbed807d6 toggle collapse when clicking on collapse state text 2019-01-19 08:22:56 +01:00
Torkel Ödegaard 16d476d228 Query editor row style update & sass cleanup 2019-01-18 19:22:40 +01:00
Torkel Ödegaard 12468c6033 Delete .all.ts@neomake_22624_74.ts 2019-01-18 19:14:22 +01:00
Torkel Ödegaard 5ab9a7c2b8 Further refinements of typings 2019-01-18 19:11:30 +01:00
Torkel Ödegaard 5d17ad1103 more typings work around data query and data source 2019-01-18 18:59:32 +01:00
Torkel Ödegaard 1d2902715f wip: progress on adding query types 2019-01-18 18:14:27 +01:00
Torkel Ödegaard a69f79caed wip: more typings 2019-01-18 17:43:58 +01:00
Torkel Ödegaard 98fabfae3e wip: typings 2019-01-18 17:23:00 +01:00
Torkel Ödegaard a231e57c08 Merge pull request #14954 from grafana/minor-style-change
Panel edit mode style tweaks
2019-01-18 16:41:16 +01:00
Torkel Ödegaard 4712a87733 Revert "Specify expected encoding for access/secret key" 2019-01-18 16:37:43 +01:00
Torkel Ödegaard 521c8f34f7 Moved add query button to the right 2019-01-18 15:29:58 +01:00
Pavel Bakulev 43c3d5b8ba Updated removing notification channel by uid 2019-01-18 16:26:23 +02:00
Pavel Bakulev c27bf6e688 Check that alert notification with id already exists in notification settings 2019-01-18 16:19:06 +02:00
Torkel Ödegaard 4c9046d6c0 Merge pull request #14951 from SamuelToh/14947_gitlab_doc_correction
14947: fixed incorrect flag
2019-01-18 15:10:32 +01:00
Torkel Ödegaard 8a4ce3e4cc Merge pull request #14945 from grafana/hugoh/bug-misalignment-of-explore-panels
Hack for getting the same height in splitted view
2019-01-18 15:09:17 +01:00
Torkel Ödegaard 916f9befa1 Merge pull request #14944 from grafana/explore-datasource-editor-fix
Fixed issue with explore angular query editor support
2019-01-18 14:40:17 +01:00
Torkel Ödegaard 90a324b456 Merge pull request #14953 from flopp999/patch-11
change enabled to true
2019-01-18 14:39:12 +01:00
flopp999 5f4e4a813d change enabled to true
if it is false it will not work
2019-01-18 14:06:15 +01:00
SamuelToh 69e3dc2d4f 14947: fixed incorrect flag 2019-01-18 22:46:43 +10:00
Torkel Ödegaard 453ca25847 Merge branch 'master' of github.com:grafana/grafana 2019-01-18 13:32:58 +01:00
Torkel Ödegaard a0eddad323 Merge pull request #14934 from grafana/hugoh/refactor-gauge-to-work-with-thresholds
Refactor gauge to work with thresholds
2019-01-18 13:24:52 +01:00
Torkel Ödegaard 46ff9dda71 Fixed scrollbar issue where it jumped to the top 2019-01-18 13:24:26 +01:00
Torkel Ödegaard 3a827fc2f1 Added test case dashboard 2019-01-18 13:12:32 +01:00
Hugo Häggmark 11944adc9c fix: Hack for getting the same height in splitted view, view could use refactor IMHO #14853 2019-01-18 12:03:16 +01:00
Torkel Ödegaard f16101101d Minor refactoring and name changes 2019-01-18 11:58:29 +01:00
Torkel Ödegaard f2498645d0 Fixed issue with explore angular query editor support introduced by recent angular query editor changes 2019-01-18 11:20:55 +01:00
Hugo Häggmark 4cc0be2568 Redid logic for fontcolor and thresholds in Gauge and added tests 2019-01-18 09:54:25 +01:00
Torkel Ödegaard bc8f3374a3 Merge pull request #14936 from grafana/plugin-types-refactor
Plugin types refactor
2019-01-18 08:21:29 +01:00
Hugo Häggmark c17ccf2289 Make sure we do not change -Infinity 2019-01-18 07:10:00 +01:00
Hugo Häggmark 5448b72f7c Passed the theme to Gauge 2019-01-18 06:57:00 +01:00
Hugo Häggmark 8ccf212f34 Added tests for formatted value 2019-01-18 06:40:30 +01:00
Hugo Häggmark 4f6e87bbbf Small refactor of Gauge and tests 2019-01-18 06:40:30 +01:00
Hugo Häggmark a6e2be862c Added typings and refactored valuemappings code 2019-01-18 06:40:30 +01:00
Hugo Häggmark 9a01f3e517 Moved Gauge to ui/components 2019-01-18 06:40:30 +01:00
Hugo Häggmark 554d010332 Preparing move to ui/viz 2019-01-18 06:40:30 +01:00
Hugo Häggmark 9dcf3d58ea Fixed getFontColor, added tests and fixed thresholds logic 2019-01-18 06:40:30 +01:00
Hugo Häggmark 533b938fcd Removed baseColor 2019-01-18 06:40:30 +01:00
sharkpc0813 35013a28cd add timeout test for alert handling. 2019-01-18 11:23:00 +09:00
bergquist fd937e3d95 remove maxage from session token 2019-01-17 21:03:27 +01:00
Marcus Efraimsson 81879f0162 fix broken code 2019-01-17 20:29:26 +01:00
Marcus Efraimsson 97c7963f17 fix cannot set cookie when response is written 2019-01-17 20:27:53 +01:00
Torkel Ödegaard 20c8b9c4a0 began work on react query editor props and integration 2019-01-17 20:02:43 +01:00
Torkel Ödegaard 205e2acdd8 Added data source type to explore state 2019-01-17 19:17:29 +01:00
Torkel Ödegaard a6f6ed4191 updated snapshot 2019-01-17 19:04:53 +01:00
Torkel Ödegaard ecab597e5e renaming DataSource type to DataSourceSettings and moved to grafana ui 2019-01-17 18:51:07 +01:00
Torkel Ödegaard e89746c3d0 Merge pull request #14920 from grafana/12133-autofill-event-hack
iOS login button should be enabled when using browser autofill
2019-01-17 18:41:24 +01:00
Torkel Ödegaard df0f654da6 Merge pull request #14937 from grafana/fixed-teams-user-picker
Fixed issue with team and user picker
2019-01-17 18:41:04 +01:00
Torkel Ödegaard 32f917557f Fixed issue with team and user picker, fixes #14935 2019-01-17 18:03:46 +01:00
Torkel Ödegaard febb9e7168 Moved data source and data query types 2019-01-17 17:59:47 +01:00
Torkel Ödegaard 4fc9d794ca Moved plugin types to @grafana/ui 2019-01-17 17:37:34 +01:00
Marcus Efraimsson 8b3fe41b0a log fix 2019-01-17 17:32:33 +01:00
bergquist c2accfa4c0 inital code for rotate 2019-01-17 17:11:52 +01:00
Torkel Ödegaard a201c76c5f wip: moved plugin exports 2019-01-17 17:04:24 +01:00
Leonard Gram dce180e8ac Merge pull request #14924 from xlson/repo-update-improvements
Repo update stability improvements
2019-01-17 16:56:10 +01:00
Leonard Gram aafa66f644 build: usage instruction for repo test. 2019-01-17 16:55:12 +01:00
Leonard Gram a95fe15437 build: comments 2019-01-17 16:42:27 +01:00
Torkel Ödegaard dfe1b20f3d Merge pull request #14930 from grafana/react-query-editor
React query editor (part1)
2019-01-17 15:41:12 +01:00
Torkel Ödegaard 3cb73e7948 Minor fix scrollpos when duplicating 2019-01-17 15:11:38 +01:00
Torkel Ödegaard a6683dd90e Merge branch 'master' into react-query-editor 2019-01-17 14:57:49 +01:00
David 6f6c4652dc Merge pull request #14928 from grafana/davkal/14926-loki-missing
Explore: Fix datasource selector being empty with single datasource
2019-01-17 14:49:55 +01:00
Torkel Ödegaard c913263b23 Merge pull request #14875 from grafana/page-layout-component
CustomScrollbar on all-React-pages
2019-01-17 14:49:19 +01:00
Torkel Ödegaard bfadcd2968 Merge branch 'master' into page-layout-component 2019-01-17 14:48:54 +01:00
Leonard Gram a585a919b3 build: updates ci deploy. 2019-01-17 14:42:20 +01:00
Leonard Gram 9ecfc39ba5 build: fixes the path for gsutil and gcloud. 2019-01-17 14:02:10 +01:00
Torkel Ödegaard 7c22848cf6 Merge pull request #14897 from grafana/14812/formgroup-component
FormField component
2019-01-17 13:43:14 +01:00
Leonard Gram 18004562a6 build: fixes permissions issue. 2019-01-17 13:40:40 +01:00
Torkel Ödegaard 3047579cdd removed unused props from angular query component interface 2019-01-17 13:27:01 +01:00
Torkel Ödegaard f041928e58 Additional query editor row tweaks 2019-01-17 13:15:25 +01:00
Torkel Ödegaard cc4564cf8b Query editor row in react is working 2019-01-17 13:08:20 +01:00
Peter Holmberg 3ce45e7154 shortening callback functions 2019-01-17 11:57:15 +00:00
David Kaltschmidt 648a775acb Explore: Fix datasource selector being empty with single datasource
- The "missing" action was triggered unless the number of datasource >1 🤦
- Made datasource preselection more robust in case the requested datasource is already gone
2019-01-17 12:07:42 +01:00
Torkel Ödegaard 548708a8d3 Scroll to top when visualization picker is opened 2019-01-17 11:27:32 +01:00
Torkel Ödegaard 9cb49d14cd Made scrollbar have scrollTop and setScrollTop props so we can control scroll position 2019-01-17 11:25:44 +01:00
Leonard Gram d71f1bf4bc build: only build amd64 for enterprise. 2019-01-17 11:00:34 +01:00
Daniel Lee 44c07eb2e9 azuremonitor: guard for when switching from monaco editor
before it has fully loaded.
2019-01-17 10:55:03 +01:00
Daniel Lee dd96f2a522 azuremonitor: move files into grafana
Initial port of the code from the plugin - lots of small things to fix.
2019-01-17 10:55:03 +01:00
Marcus Efraimsson af8425da08 Merge pull request #14918 from ScottBrenner/patch-1
cloudwatch.md - quick typo fix
2019-01-17 10:50:05 +01:00
Torkel Ödegaard bc956057c3 Query editor row react progress, buttons working 2019-01-17 10:26:08 +01:00
Leonard Gram 7ac859715d build: test script for rpm repo. 2019-01-17 10:17:59 +01:00
Johannes Schill 1dfabf498a chore: Replace the deprecated SFC with FC 2019-01-17 09:27:43 +01:00
Johannes Schill 71121e1dbe chore: Wrap footer with React's memo hoc 2019-01-17 09:15:47 +01:00
Johannes Schill 00646b80c6 chore: Reduce code duplication by letting the page component adding the header and taking care of the page title 2019-01-17 09:01:17 +01:00
Torkel Ödegaard 5681370680 mini stylefix to select component 2019-01-17 08:40:23 +01:00
Scott Brenner a6a70db066 cloudwatch.md - quick typo fix
"you grafana" ➡️ "your Grafana"
2019-01-16 22:03:29 -08:00
Peter Holmberg 736db86d6e removing Label and going with FormLabel 2019-01-16 18:02:27 +00:00
Dominik Prokop c08313842c Use light theme in storybook 2019-01-16 18:22:08 +01:00
Torkel Ödegaard 6a66d462aa Toggle edit mode works 2019-01-16 17:53:40 +01:00
bergquist aba6148c43 login users based on token cookie 2019-01-16 16:44:40 +01:00
Johannes Schill 234713466e test: Update snapshots and mocks 2019-01-16 16:29:07 +01:00
Leonard Gram cae2bdf994 build: deb repo update test usage instructions. 2019-01-16 16:18:10 +01:00
Johannes Schill 3ca7523a02 fix: Use Page component on "Api Keys" and "Preferences" under Configuration 2019-01-16 16:16:19 +01:00
Leonard Gram 38bcb88d8a build: uploads binaries before metadata in deb repo. 2019-01-16 16:05:45 +01:00
Johannes Schill feeb3ea56d feat: Generate page titles from navModel 2019-01-16 16:03:15 +01:00
Johannes Schill 25304629bd test: Updated snapshots 2019-01-16 16:03:15 +01:00
Johannes Schill 6bd87098cf chore: Better way of getting the body node 2019-01-16 16:03:15 +01:00
Johannes Schill 1e80bac2d2 chore: Reactify footer 2019-01-16 16:03:15 +01:00
Johannes Schill d426981d1d fix: Add Pages component to Plugins and TeamList 2019-01-16 16:03:15 +01:00
Johannes Schill b2961a4b4a fix: Configuration: Users should also use the Page component 2019-01-16 16:03:15 +01:00
Johannes Schill 06d8243ab5 feat: Possibility to change document title on pages using the Page component 2019-01-16 16:03:15 +01:00
Johannes Schill 8237c22e24 fix: Add CustomScroller on DataSources page 2019-01-16 16:03:15 +01:00
Johannes Schill 47d86ee818 fix: Proper types for linter 2019-01-16 16:01:42 +01:00
Johannes Schill 9e0e91a90a test: Snapshot update 2019-01-16 16:01:42 +01:00
Johannes Schill 1d8e036bcb fix: Fix import path after Scrollbar move to @grafana/ui 2019-01-16 16:01:42 +01:00
Torkel Ödegaard 7f4a479451 POC of page layout component 2019-01-16 16:01:42 +01:00
Pavel Bakulev 6a8e39ba17 Added uid to AlertNotification json 2019-01-16 16:52:00 +02:00
Pavel Bakulev f461d52004 Converted notification id to uid via fmt for old alert notification settings 2019-01-16 16:52:00 +02:00
Pavel Bakulev 2de32756c2 Returned id for alert notifications which were created without uid 2019-01-16 16:52:00 +02:00
Pavel Bakulev 4bcace567b Formatted errors to err 2019-01-16 16:50:00 +02:00
Pavel Bakulev d0370ea7ad Using func InitNotifier for verifying notification settings 2019-01-16 16:50:00 +02:00
Pavel Bakulev f132e929ce Added uid for alert notifications 2019-01-16 16:50:00 +02:00
Pavel Bakulev 6d1ec19fe9 Renamed validation funcs for alert notification 2019-01-16 16:45:42 +02:00
Pavel Bakulev 7b09dd38d8 Commented alert_notifications sample config 2019-01-16 16:45:42 +02:00
Pavel Bakulev 5c10a897f8 Instantiating notifiers from config before using 2019-01-16 16:45:42 +02:00
Pavel Bakulev e1b87fc597 Added parameter org_name of alert notification to documentation 2019-01-16 16:45:42 +02:00
Pavel Bakulev 4fa45253cf Added orgName parameter for alert_notifications 2019-01-16 16:45:42 +02:00
Pavel Bakulev 6e3e9a337d Added alert_notification configuration 2019-01-16 16:45:42 +02:00
Peter Holmberg 01251927b3 redoing input props 2019-01-16 14:43:22 +00:00
Pavel 8011a6f45b Merge pull request #6 from grafana/master
Updating master
2019-01-16 16:35:59 +02:00
Torkel Ödegaard 8fef2138b2 another minor style change 2019-01-16 15:35:32 +01:00
Peter Holmberg 0d95527924 Merge branch 'master' into 14812/formgroup-component 2019-01-16 14:27:47 +00:00
Torkel Ödegaard 05b82bede3 More style tweaks to thresholds 2019-01-16 15:13:59 +01:00
Johannes Schill a558e76a68 fix: Manually trigger a change-event when autofill is used in webkit-browsers #12133 2019-01-16 15:10:37 +01:00
Peter Holmberg 4c4e88910d move styling 2019-01-16 13:52:38 +00:00
Peter Holmberg 4c40274313 renaming after pr feedback 2019-01-16 13:46:57 +00:00
Torkel Ödegaard cc8b450799 minor style change 2019-01-16 14:36:01 +01:00
Torkel Ödegaard ff8592d1fe Merge pull request #14909 from grafana/hugoh/move-valuemappings-to-ui-components
Move ValueMappings to UI Components
2019-01-16 14:10:25 +01:00
Torkel Ödegaard 166e5edebd wip: testing new query editor row design 2019-01-16 14:00:29 +01:00
Hugo Häggmark 8df11e93a1 Removed snapshot 2019-01-16 12:46:43 +01:00
Hugo Häggmark 013d46b707 Refactored ValueMappings 2019-01-16 12:29:43 +01:00
Hugo Häggmark c90979a8f0 Moved ValueMappings to grafana/ui/component and renamed it ValueMappingsEditor 2019-01-16 12:29:04 +01:00
Hugo Häggmark 639dc6c3c3 Moved Label to grafana/ui/components 2019-01-16 12:29:04 +01:00
Torkel Ödegaard 4bad76c0f4 Merge branch 'master' into react-query-editor 2019-01-16 12:23:25 +01:00
Torkel Ödegaard 6edc4e9f02 Merge pull request #14898 from grafana/hughag/template-variable-support-for-react-panels
Template variable support for react panels
2019-01-16 11:39:30 +01:00
David 25e6d075ab Merge pull request #14821 from grafana/davkal/explore-redux
Explore: Redux migration
2019-01-16 11:13:30 +01:00
Leonard Gram b3512f43a3 build: repo update testable and more robus.
- adds script for integration testing
- package path parameterized
- more robust updates
2019-01-16 11:11:00 +01:00
Dominik Prokop 6d3e6b1fcb Experimenting with generating doc for ui component 2019-01-16 10:27:09 +01:00
David Kaltschmidt 9575a4a2c0 Move action properties to payload 2019-01-16 10:21:11 +01:00
Torkel Ödegaard 824a9a85db Merge pull request #14890 from grafana/14871-unit-picker-scroll-issue
fix: It should be possible to scroll in the unit picker before select…
2019-01-16 09:53:30 +01:00
Hugo Häggmark 45a08792be Fixed small bug with entries outside the min max values 2019-01-16 09:50:05 +01:00
Hugo Häggmark f16a2c0f48 Fixed NaN issue when parsing 2019-01-16 09:50:05 +01:00
Hugo Häggmark 38c0e91666 Remove BasicGaugeColor from state 2019-01-16 09:50:05 +01:00
Hugo Häggmark 0b1aea905a Fixed so that we can not change base threshold 2019-01-16 09:50:05 +01:00
Hugo Häggmark aaaf3f7ff1 Fixed so added threshold colors are always unique 2019-01-16 09:50:05 +01:00
Hugo Häggmark 2836bc2a13 Fixed issue with changing value not changing index 2019-01-16 09:50:05 +01:00
Hugo Häggmark 92a1b55a4a Fixed styling for small screens 2019-01-16 09:50:05 +01:00
Hugo Häggmark ad1505b346 Reordered the input row 2019-01-16 09:50:05 +01:00
Hugo Häggmark 39c672cb1f Fixed the circle 2019-01-16 09:50:05 +01:00
Hugo Häggmark 7934116e5c Fixed styling 2019-01-16 09:50:05 +01:00
Hugo Häggmark a431efa0da Refactored logic in ThresholdEditor 2019-01-16 09:50:05 +01:00
Torkel Ödegaard 030d20d90d Merge pull request #14896 from grafana/scrollbar-select-fix
Scrollbar select fix
2019-01-16 09:46:10 +01:00
Carl Bergquist f9560f949d Merge pull request #14885 from bergquist/remove_log2
removes global log 2 functions
2019-01-16 09:34:40 +01:00
David Kaltschmidt 6ff15039a9 File organization, action naming, comments
- moved ActionTypes to `./state/actionTypes`
- renamed click-related actions
- added comments to actions and state types
- prefixed Explore actions with `explore/`
- fixed query override issue when row was added
2019-01-15 20:04:05 +01:00
David Kaltschmidt 9aede9e636 Fix reducer issues 2019-01-15 20:04:03 +01:00
David Kaltschmidt 546a3a9d98 Connect Explore child components to store 2019-01-15 20:04:01 +01:00
David Kaltschmidt 607f7c25de Update comments 2019-01-15 20:03:59 +01:00
David Kaltschmidt f02f41c9b0 Move types to types/explore 2019-01-15 20:03:57 +01:00
David Kaltschmidt be172d3e4a Save state in URL and fix tests 2019-01-15 20:03:55 +01:00
David Kaltschmidt 68c039b289 Allow multiple Explore items for split 2019-01-15 20:03:53 +01:00
David Kaltschmidt 2be2deddb8 WIP Explore redux migration 2019-01-15 20:03:51 +01:00
Hugo Häggmark 5c9c024475 Fixed a bug with prefix and suffix not showing when using value mappings 2019-01-15 18:41:04 +01:00
Peter Holmberg 83fbf52aac fixing imports, minor fix on mapping row 2019-01-15 17:33:42 +00:00
Peter Holmberg 58094faa12 test and minor fix on mapping row 2019-01-15 17:31:42 +00:00
Torkel Ödegaard 9bf3d49393 updated snapshot 2019-01-15 18:26:21 +01:00
Peter Holmberg 219da09f0e Merge branch 'master' into 14812/formgroup-component 2019-01-15 17:19:13 +00:00
Hugo Häggmark 6bb2d5ff24 Added suffix interpolation 2019-01-15 18:05:55 +01:00
Torkel Ödegaard 7105d16131 Scrollbar select fix 2019-01-15 18:02:05 +01:00
Dominik Prokop b7451bc774 Merge pull request #14894 from grafana/grafana-ui/move-spectrum
Move ColorPicker leftovers to @grafana/ui
2019-01-15 17:57:24 +01:00
Dominik Prokop 8cfa2c00d1 Remove duplicated import 2019-01-15 17:35:24 +01:00
Hugo Häggmark 1faa5819a8 Initial commit 2019-01-15 17:15:46 +01:00
Daniel Lee 3bdd4a5c33 changelog: adds note for #14795 2019-01-15 17:14:58 +01:00
Daniel Lee 8e771f9a8f Merge pull request #14876 from grafana/davkal/14795-annotation-step
Prometheus: Fix annotation step calculation
2019-01-15 17:12:07 +01:00
Dominik Prokop 2991b64b60 Merge branch 'grafana-ui/move-spectrum' into tooling/storybook-poc 2019-01-15 16:14:01 +01:00
Dominik Prokop 89a0d1090d Move ColorPicker leftovers to @grafana/ui 2019-01-15 15:43:17 +01:00
Marcus Efraimsson 8764fb5aa6 inject login/logout hooks 2019-01-15 15:16:20 +01:00
Marcus Efraimsson b0df7280be begin user auth token implementation 2019-01-15 15:16:20 +01:00
Marcus Efraimsson e08f61059b utils 2019-01-15 15:16:20 +01:00
Johannes Schill d59f1fe629 fix: It should be possible to scroll in the unit picker before selecting a value #14871 2019-01-15 14:15:04 +01:00
bugficks f31fe495e9 fix go fmt 2019-01-15 13:54:25 +01:00
bugficks 7db848f153 [Feature request] MySQL SSL CA in datasource connector
https://github.com/grafana/grafana/issues/8570
2019-01-15 13:29:56 +01:00
bergquist 3cd0cb3d3f removes debug2 logging 2019-01-15 11:52:39 +01:00
bergquist 1b6203e430 removes error2 logger 2019-01-15 11:49:18 +01:00
Torkel Ödegaard 33feb26fb5 WIP: good progress on react query editor support 2019-01-15 11:40:12 +01:00
Leonard Gram d907b1ec6b Updates to latest checking. 2019-01-15 11:00:45 +01:00
Leonard Gram 85c68cc734 5.4.3 changelog 2019-01-15 10:49:53 +01:00
bergquist 1c0a385df1 changelog: adds ntoe about closing #12864 2019-01-15 10:37:56 +01:00
Carl Bergquist 1a7eb2f462 Merge pull request #14868 from bergquist/provisioning_inifinite_loop
Avoid infinite loop in the dashboard provisioner
2019-01-15 10:34:18 +01:00
sharkpc0813 e172bade40 fix that alert context and result handle context do not use the same derived context. 2019-01-15 17:51:50 +09:00
Daniel Lee 191f603459 docs: add a title to the Explore docs 2019-01-15 09:36:23 +01:00
Leonard Gram f5e0d02eb8 Merge pull request #14872 from xlson/build-fixes
build: fixes release problems.
2019-01-15 09:35:32 +01:00
Daniel Lee 16881f64dd Merge pull request #14751 from grafana/reactify-stackdriver
Reactify stackdriver
2019-01-15 00:08:56 +01:00
Daniel Lee 7b1aed6caf stackdriver: converts some variables from any to types 2019-01-14 23:43:31 +01:00
Peter Holmberg ac62e4a992 FormGroup component and implements 2019-01-14 22:09:06 +00:00
Torkel Ödegaard 0941097dc4 Merge pull request #14880 from grafana/restored-http-settings
Restored http settings directive that was hidden in an unused angular controller
2019-01-14 21:44:30 +01:00
Torkel Ödegaard 6b4dcb38ea Restored http settings directive that was hidden in an unused angular controller page 2019-01-14 21:21:58 +01:00
Daniel Lee 18abb87cbb stackdriver: small fixes after reactifying 2019-01-14 18:23:01 +01:00
Leonard Gram 03c6cc59a7 changelog 2019-01-14 18:01:19 +01:00
Daniel Lee b4a51ad7ce stackdriver: add help text for bucket alias 2019-01-14 17:52:06 +01:00
David Kaltschmidt ce3117507a Prometheus: Fix annotation step calculation
- since e731c248d7 step calculation for
annotation queries was broken
- this change puts the interval in the correct parameter so it gets
considered in `createQuery`
- added tests
2019-01-14 17:40:47 +01:00
Daniel Lee d7a3f91b3c stackdriver: fixes space before caret icon in query editor 2019-01-14 17:25:43 +01:00
Torkel Ödegaard b0aa1bc71c Merge pull request #14874 from coder-salman/patch-1
Fixed Syntax for folder permission's JSON
2019-01-14 17:02:48 +01:00
Mohammed Salman Khan aa799c6f0b Fixed Syntax for folder permission's JSON 2019-01-14 10:53:16 -05:00
bergquist 8880829eda avoid infinite loop in the dashboard provisioner
if one dashboard with an uid is refered to by two
provsioners each provsioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.

ref #12864
2019-01-14 16:38:39 +01:00
Leonard Gram 7b43b9e272 build: fixes release problems. 2019-01-14 16:23:48 +01:00
Marcus Efraimsson 7da544a52b changelog: add notes about closing #5968 2019-01-14 16:03:30 +01:00
Marcus Efraimsson 130e4aa666 Merge pull request #14608 from marefr/es_bucket_script
Fix support bucket script pipeline aggregations
2019-01-14 15:58:42 +01:00
Daniel Lee a2f6c503a2 Merge remote-tracking branch 'origin/master' into reactify-stackdriver 2019-01-14 15:48:13 +01:00
Torkel Ödegaard 0260c779e8 wip: another wip commit 2019-01-14 15:44:58 +01:00
Torkel Ödegaard 23f84ba5c5 Merge branch 'master' into react-query-editor 2019-01-14 15:39:05 +01:00
Torkel Ödegaard 574760c7e1 Merge pull request #14869 from grafana/clean-ups-and-moves
Clean ups and moves
2019-01-14 15:38:28 +01:00
Dominik Prokop ad9c96abb5 Merge branch 'master' into tooling/storybook-poc 2019-01-14 15:26:13 +01:00
Torkel Ödegaard c41171d451 Merge pull request #14859 from grafana/fix/gauge-sizing
Fixed Gauge being cropped when resizing panel
2019-01-14 15:21:42 +01:00
Torkel Ödegaard 827a292777 Moved panel editing components to it's own folder 2019-01-14 15:17:48 +01:00
Torkel Ödegaard b9a3239edb removed old unused angular stuff, rename 2019-01-14 15:01:47 +01:00
Torkel Ödegaard 0644410b99 wip: react query editors 2019-01-14 14:55:22 +01:00
Torkel Ödegaard bcf88f6157 Merge pull request #14867 from grafana/value-format-fixes2
Updated singlestat to use new value format function signature
2019-01-14 14:50:17 +01:00
Dominik Prokop 0c8f0416a0 Move panel width/height calculation to PanelChrome 2019-01-14 14:47:41 +01:00
Torkel Ödegaard 37c5ced009 Updated singlestat to use new value format function syntax and capitalized unit categories, fixes #12871 2019-01-14 14:03:08 +01:00
Leonard Gram b1f5a232da build: build specific enterprise version when releasing. 2019-01-14 13:43:59 +01:00
Dominik Prokop b3b1c21d77 Fixed Gauge being cropped when resizing panel
Enabled import of SASS viariables into TS
2019-01-14 09:45:55 +01:00
Torkel Ödegaard 46f2808eaf Merge pull request #14849 from grafana/panel-option-section
WIP: Panel option section moved to grafana-ui and new panel option grid
2019-01-14 09:44:33 +01:00
Torkel Ödegaard 9d4354b7c9 Merge pull request #14857 from grafana/14851-velocity-units
units: adds back velocity units.
2019-01-14 08:30:02 +01:00
Daniel Lee 1fea09ba54 units: adds back velocity units. Fixes #14851 2019-01-13 23:37:53 +01:00
bergquist db448b5d53 Merge branch 'fredbcode-master'
* fredbcode-master:
  Fix bug tls renegociation problem in Notification channel (webhook) #14800
2019-01-13 21:43:47 +01:00
fredbcode 110ffb69de Fix bug tls renegociation problem in Notification channel (webhook) #14800 2019-01-13 21:42:33 +01:00
Carl Bergquist 9793c08613 Merge pull request #14855 from papagian/14841-api-error-unexisting-alert-notification
Fix Error 500 on unexisting /api/alert-notification/<id>
2019-01-13 21:05:54 +01:00
Sofia Papagiannaki 8def73ba13 Fix Error 500 on unexisting /api/alert-notification/<id> 2019-01-13 21:30:20 +02:00
Torkel Ödegaard 9e0f961fd5 updated snapshot 2019-01-13 12:51:21 +01:00
Torkel Ödegaard c11ec79056 Minor renames and other fixes 2019-01-13 12:42:21 +01:00
NighterMan ec0fe11939 pushover: add support for attaching images (closes #10780)
Use native pushover native attachment support to deliver images
2019-01-13 04:09:51 +01:00
Torkel Ödegaard 8f5300dd2a Merge pull request #14848 from grafana/grafana-ui-simple-layout
Simplified folder structure in grafana-ui lib
2019-01-12 21:47:07 +01:00
Torkel Ödegaard 5b59d59afa panel option section moved to grafana-ui and new panel option grid component 2019-01-12 21:43:41 +01:00
Torkel Ödegaard 9c54da8f5d Simplified folder structure in grafana-ui lib 2019-01-12 20:43:15 +01:00
Torkel Ödegaard 1cc6d0e787 Merge pull request #14716 from grafana/kbn-formats-refactor
WIP: Move value formats to @grafana/ui
2019-01-12 19:43:08 +01:00
Torkel Ödegaard 10bbb32d00 Merge pull request #14842 from grafana/time-overrides-test
Panel time override tests
2019-01-12 19:36:23 +01:00
Dominik Prokop 7289e6e500 Addedd assertions about raw time range when panel time overriden 2019-01-11 16:49:29 +01:00
Dominik Prokop c3fdc1a0fb Panel time override tests 2019-01-11 16:21:44 +01:00
Erik Sundell b6171fa3c7 add feedback to what interval is being used (calculated in the backend) 2019-01-11 15:14:35 +01:00
Erik Sundell e73d363129 Merge remote-tracking branch 'origin/master' into reactify-stackdriver
# Conflicts:
#	public/app/core/angular_wrappers.ts
#	yarn.lock
2019-01-11 15:12:29 +01:00
Torkel Ödegaard ba9d5115d2 Merge branch 'master' into kbn-formats-refactor 2019-01-11 14:33:04 +01:00
Erik Sundell b596550210 use typings for ds and template srv 2019-01-11 13:53:04 +01:00
Torkel Ödegaard 9e6411bf4b value formats: another rename and updates code to use new valueFormats func 2019-01-11 13:31:25 +01:00
Hugo Häggmark f5ae40cf54 Merge pull request #14811 from grafana/move-threshold-component-to-ui-components
Moved Thresholds and styles to grafana/ui/components
2019-01-11 12:14:09 +01:00
Hugo Häggmark d97cd450c9 Merge 2019-01-11 11:41:08 +01:00
Torkel Ödegaard 8aae6e8c09 value formats: renamed folder 2019-01-11 11:31:40 +01:00
Hugo Häggmark d2b71cff37 Reverted move of defaults for GaugePanelOptions 2019-01-11 11:25:49 +01:00
Torkel Ödegaard bc78c8d56e Merge pull request #14817 from grafana/grafana-ui/select
Migrate Select components to @grafana/ui
2019-01-11 11:13:12 +01:00
Erik Sundell 3871ef29f9 refactoring alias by 2019-01-11 10:29:53 +01:00
Dominik Prokop 391253ee2d Merge branch 'master' into grafana-ui/select 2019-01-11 09:52:26 +01:00
Dominik Prokop 537e2534a6 Move Select styles to grafana/ui 2019-01-11 09:50:05 +01:00
Torkel Ödegaard 11ad92c08e Merge pull request #14831 from grafana/fix/time-range-overrides
Fix panel time overrides not being applied fully
2019-01-11 09:38:15 +01:00
Torkel Ödegaard fda0f92cf9 Merge pull request #12991 from pgiraud/repeat_min_span
Repeating panels - Max per row
2019-01-11 09:31:21 +01:00
Torkel Ödegaard 5d53f7e68b Merge pull request #14834 from grafana/14793/loading-placeholder-to-grafanaui
Loading placeholder to grafanaui
2019-01-11 09:25:34 +01:00
Hugo Häggmark 5ceedc4ac4 Moved defaultProps to ui/components 2019-01-11 09:16:53 +01:00
Torkel Ödegaard 6d669e2c74 Merge branch 'master' into 14793/loading-placeholder-to-grafanaui 2019-01-11 09:10:49 +01:00
Hugo Häggmark 0b8165fee2 Merge branch 'move-threshold-component-to-ui-components' of https://github.com/grafana/grafana into move-threshold-component-to-ui-components 2019-01-11 08:46:59 +01:00
Hugo Häggmark c54ec5f52f Moved the rest of Threshold dependencies to ui/components 2019-01-11 08:30:30 +01:00
Hugo Häggmark c05b92c2e0 Renamed Threshold files 2019-01-11 07:14:28 +01:00
Hugo Häggmark 0b6e21e9ac Renamed Thresholds to ThresholdsEditor 2019-01-11 07:12:53 +01:00
Hugo Häggmark 1581662a6c Moved Thresholds and styles to grafana/ui/components 2019-01-11 07:11:40 +01:00
Hugo Häggmark dc9b83030f Removed default export for colors 2019-01-11 07:03:12 +01:00
Hugo Häggmark 6f2bbb7378 Fixed typings 2019-01-11 07:03:12 +01:00
Hugo Häggmark 37dae043d7 Small change in SeriesColorPickerPopoverProps 2019-01-11 07:03:12 +01:00
Hugo Häggmark d376fae393 Moved colorpicker to ui/components 2019-01-11 07:03:12 +01:00
Peter Holmberg 2f0ab99ae5 Fixing test and small refactor 2019-01-10 22:15:37 +00:00
Peter Holmberg 08ac2959a4 Moving to grafana ui, fix issue with TestRuleResult 2019-01-10 21:47:09 +00:00
Torkel Ödegaard 7e106b0f49 Merge pull request #14805 from SamuelToh/11503_prevent_end_of_regexpr
11503: escape measurement filter regex value
2019-01-10 20:29:07 +01:00
Dominik Prokop 60fadcf1e5 Fix panel time overrides not being applied fully
When both relative and time shift were applied, only time shift was taken into consideration
2019-01-10 20:15:03 +01:00
Erik Sundell b64115e5f5 access scope directly from this. update tests 2019-01-10 17:18:24 +01:00
Leonard Gram 0f82fffed6 build: makes sure all builds use the latest container. 2019-01-10 16:52:21 +01:00
Leonard Gram cdfdc676ae changelog: docker images for arm. 2019-01-10 16:50:36 +01:00
Dominik Prokop d322717f3e Renamed Select related components: Picker* to Select*, Option* to SelectOption* 2019-01-10 15:21:11 +01:00
Carl Bergquist 0a98306e4b Merge pull request #14813 from bergquist/zero_frequency
Make sure that frequency is never set to zero
2019-01-10 15:20:01 +01:00
Leonard Gram c22ef628f3 build: removes curl install from build. 2019-01-10 15:12:43 +01:00
Leonard Gram a82f0ed393 build: tags arm as well as amd64 as latest. 2019-01-10 14:41:02 +01:00
Johannes Würbach 702d449001 Docker image for ARM 2019-01-10 14:41:02 +01:00
Dominik Prokop 53f0f08efa Fixing TS and updating snapshot 2019-01-10 14:24:24 +01:00
bergquist fbb3ad5fc4 make sure frequency cannot be zero
frequency set to zero causes division by zero
panics in the alert schedular.

closes #14810
2019-01-10 14:17:10 +01:00
Erik Sundell 6a2f5eb61e refactoring. fix broken test 2019-01-10 13:49:11 +01:00
Dominik Prokop 7819529d45 Migrate Select components to @grafana/ui 2019-01-10 13:29:53 +01:00
Erik Sundell 5fed50713d provide angular directive scope props correctly 2019-01-10 12:02:38 +01:00
Daniel Lee 96759e39a6 docker: enable flux in influxdb docker block 2019-01-10 09:47:39 +01:00
Hugo Häggmark 5fc0766341 Moved Thresholds and styles to grafana/ui/components 2019-01-10 09:37:32 +01:00
Torkel Ödegaard 1dc1af7e00 Update README.md 2019-01-10 08:37:40 +01:00
Torkel Ödegaard 322a3efb25 Merge pull request #14779 from grafana/tooling/ignore-not-found-export-warnings
Removes unnecessary warnings from webpack output about missing exports
2019-01-10 07:25:35 +01:00
Torkel Ödegaard 4c42db9e95 Merge pull request #14804 from SamuelToh/4075_support_templatevar_on_alias_es_ds
4075: Interpolate tempvar on alias
2019-01-10 07:24:17 +01:00
Torkel Ödegaard b25214bfe1 Merge pull request #14786 from grafana/14729-move-testrulebutton-to-toolbar
14729 move testrulebutton to toolbar
2019-01-10 07:11:45 +01:00
SamuelToh 9e3ab71e40 11503: escape measurement filter regex value 2019-01-10 10:47:22 +10:00
SamuelToh e1f6870fce 4075: Interpolate tempvar on alias 2019-01-10 09:53:06 +10:00
Peter Holmberg 31d35a6884 rename 2019-01-09 22:21:42 +00:00
Peter Holmberg 13e6d2c5cb fixing unitpicker 2019-01-09 22:05:29 +00:00
Peter Holmberg 78fe2db5e5 removing tests 2019-01-09 21:35:01 +00:00
Peter Holmberg cf4f98857a Merge branch 'master' into move-value-formats 2019-01-09 21:13:53 +00:00
Torkel Ödegaard 032d69fc21 Merge pull request #14801 from grafana/reorganize-gauge-panel
Minor refactor of Gauge panel
2019-01-09 18:26:17 +01:00
Torkel Ödegaard ddaec8db58 Merge pull request #14796 from grafana/14271-tooltip-themes
feat: Tooltip theme and use it on panel edit tabs
2019-01-09 17:36:49 +01:00
Dominik Prokop cdc99e129f React graph panel options component rename 2019-01-09 17:21:14 +01:00
Dominik Prokop 1618e90844 Minor refactor of Gauge panel 2019-01-09 17:00:10 +01:00
Leonard Gram 13a962cc50 Revert "Docker image for ARM"
This reverts commit 5f7e6a5c73.
2019-01-09 16:25:07 +01:00
Leonard Gram a237a495b0 Revert "build: fixes docker push."
This reverts commit be57f6878c.
2019-01-09 16:25:07 +01:00
Leonard Gram be57f6878c build: fixes docker push. 2019-01-09 15:52:04 +01:00
Johannes Schill d8a91fa355 feat: Add brand as tooltip theme and use it on panel edit tabs #14271 2019-01-09 15:36:53 +01:00
Johannes Würbach 5f7e6a5c73 Docker image for ARM 2019-01-09 15:09:13 +01:00
Torkel Ödegaard ba19773347 Merge pull request #14792 from grafana/adios-scrollbar
chore: Remove ScrollBar component, superseded by CustomScrollbar
2019-01-09 14:51:33 +01:00
Erik Sundell 23996b364e fix broken test 2019-01-09 14:44:47 +01:00
Erik Sundell 92121cacd1 Merge remote-tracking branch 'origin/master' into reactify-stackdriver
# Conflicts:
#	yarn.lock
2019-01-09 14:33:41 +01:00
Johannes Schill 6ab1abc131 chore: Remove ScrollBar component, superseded by CustomScrollbar 2019-01-09 14:02:22 +01:00
Dominik Prokop 602bbcb0db Update storybook static files option to load statics correctly 2019-01-09 14:01:46 +01:00
Erik Sundell d51f91f54b unregister event listener correctly 2019-01-09 13:56:15 +01:00
Torkel Ödegaard 2d16c29a1a Merge pull request #14766 from grafana/fix-toggle-button-group-corners
Fix toggle button group corners
2019-01-09 13:41:40 +01:00
Hugo Häggmark 236d7b1213 Changes after PR comments 2019-01-09 13:20:50 +01:00
Dominik Prokop 525367c591 Merge branch 'master' into fix-toggle-button-group-corners 2019-01-09 13:15:34 +01:00
Dominik Prokop 6e3225c29e Removed unused refClassNameprops from Propper 2019-01-09 13:09:26 +01:00
Torkel Ödegaard 34c4e245f3 Merge pull request #14775 from grafana/14759-customscrollbar2grafanaui
chore: Move CustomScrollbar to @grafana/ui #14759
2019-01-09 12:28:30 +01:00
Torkel Ödegaard d248643881 Merge pull request #14774 from grafana/14773-light-theme-page-bg
Changed light-theme page background gradient
2019-01-09 11:52:58 +01:00
Hugo Häggmark 67e8958aec Fixed a small bug when toggling items in toolbar 2019-01-09 11:49:17 +01:00
Leonard Gram ad61bff377 build: deploys enterprise to its own repo. 2019-01-09 11:42:55 +01:00
Leonard Gram 76e9607b25 build: inline docs 2019-01-09 11:42:55 +01:00
Leonard Gram b9c4eb70b1 build: publishes beta releases to separate repos. 2019-01-09 11:42:55 +01:00
Leonard Gram 8f5886e6d4 refactoring 2019-01-09 11:42:55 +01:00
Leonard Gram bbbeb78c17 build: makes repo update enterprise compatible. 2019-01-09 11:42:55 +01:00
Leonard Gram 89956a6a41 build: uses official deployment image. 2019-01-09 11:42:55 +01:00
Leonard Gram a98c75121f build: adds aptly and createrepo to deploy tools. 2019-01-09 11:42:55 +01:00
Leonard Gram 31066aebb4 build: handles unexpected cases. 2019-01-09 11:42:55 +01:00
Leonard Gram 919617ef96 build: only adds the correct packages to the repo. 2019-01-09 11:42:55 +01:00
Leonard Gram c3e23d7574 build: rpm repo deploy. 2019-01-09 11:42:55 +01:00
Leonard Gram a26a10cfd1 build: repo update input error. 2019-01-09 11:42:55 +01:00
Leonard Gram 7fea1f84c0 build: release of debs to our debian repo. 2019-01-09 11:42:55 +01:00
Hugo Häggmark 9b8a5333cb Added tests for TestRuleButton 2019-01-09 11:39:56 +01:00
Hugo Häggmark 8b8af6436c Removed Test Rule button from Angular and view 2019-01-09 11:38:10 +01:00
Hugo Häggmark e2fe663dba Added TestRuleButton 2019-01-09 11:34:22 +01:00
Pierre GIRAUD f374da032e Hint for user on when the repeat is applied 2019-01-09 11:34:13 +01:00
Dominik Prokop 0571ad5ad7 Removes unnecessary warnings from webpack output about missing exports
This should not break anything as ForkTsCheckerWebpackPlugin takes care of that
2019-01-09 11:33:08 +01:00
Pierre GIRAUD 97b087f5a5 Use factors for max repeated panels per row 2019-01-09 11:17:48 +01:00
Dominik Prokop 0b4d212bd2 Fixing TS errors and updating snapshot 2019-01-09 10:56:40 +01:00
Dominik Prokop fae8ff5750 Move Portal to @grafana/ui 2019-01-09 10:55:38 +01:00
Johannes Schill 702e1b01bb chore: Move sass code related to custom scrollbar into @grafana/ui #14759 2019-01-09 10:35:03 +01:00
Dominik Prokop 076defdc0b Post merge updates 2019-01-09 10:33:20 +01:00
ijin08 7133b79928 Merge branch 'master' into 14773-light-theme-page-bg 2019-01-09 10:21:48 +01:00
Dominik Prokop 1e7f3f2892 Merge branch 'master' into grafana-ui/tooltip 2019-01-09 10:19:45 +01:00
Johannes Schill 6ac25d41fa chore: Move CustomScrollbar to @grafana/ui #14759 2019-01-09 09:49:45 +01:00
ijin08 fb76f41a15 changed light theme page background gradient 2019-01-09 09:42:30 +01:00
Dominik Prokop 0fb23bd334 WIP 2019-01-09 09:40:57 +01:00
Pierre GIRAUD a881497908 Max number of repeated panels per row
Instead of min width
2019-01-09 08:01:42 +01:00
Dominik Prokop 79c6fdc0e8 wip 2019-01-08 20:51:00 +01:00
Torkel Ödegaard a9808ef518 Merge pull request #14763 from grafana/14528-panel-errors
Panel errors
2019-01-08 17:41:31 +01:00
Dominik Prokop 22c9ce7de8 Make tooltips persistent when hovered 2019-01-08 17:01:50 +01:00
Leonard Gram 023e496108 docs: rpm/deb beta repo. 2019-01-08 16:49:29 +01:00
Erik Sundell ae50d83608 update snapshot 2019-01-08 16:21:38 +01:00
Erik Sundell 6c00f3e511 add form grow 2019-01-08 16:08:09 +01:00
Johannes Schill 12a3edd6e5 fix: Clean up per PR feedback. Thanks @dprokop 2019-01-08 16:04:46 +01:00
Torkel Ödegaard badd00d962 Merge pull request #14768 from grafana/14729-move-alerttab-and-statehistory
Moved AlertTab and StateHistory to app/features/alerting
2019-01-08 15:57:43 +01:00
Peter Holmberg 38dcbeb2fd removing duplicated things 2019-01-08 15:56:01 +01:00
Torkel Ödegaard df83c4650d minor code refactor 2019-01-08 15:54:52 +01:00
Torkel Ödegaard 6f6825c53a Merge pull request #14767 from grafana/14667-edit-panel
fix: When loki is default data source, datasource is passed as undefi…
2019-01-08 15:29:53 +01:00
Peter Holmberg de38769973 splitting into more files 2019-01-08 15:25:23 +01:00
Hugo Häggmark 8d210afd76 Moved AlertTab and StateHistory to app/features/alerting 2019-01-08 15:18:29 +01:00
Johannes Schill bf478a40b1 fix: When loki is default data source, datasource is passed as undefined to QueryOptions #14667 2019-01-08 14:58:57 +01:00
Erik Sundell d215eecf63 remove redundant max-width. it's already declared in gf-form-select-box__menu-list 2019-01-08 14:05:30 +01:00
Erik Sundell b8c2ba3320 add typing for metric descriptor 2019-01-08 14:03:52 +01:00
Dominik Prokop e03461cea2 Removed unused Popover component 2019-01-08 13:54:54 +01:00
Dominik Prokop ec904cf662 Update components to fit updated PopperController API 2019-01-08 13:53:59 +01:00
Erik Sundell 8867d8e99c make templateSrv a prop 2019-01-08 13:52:19 +01:00
Dominik Prokop de4e1a91f7 Refactored withPoper HOC to PopperController using render prop 2019-01-08 13:44:10 +01:00
Erik Sundell dc7f98de6a use correct event handler name convention. register directive on startup 2019-01-08 13:37:08 +01:00
Johannes Schill f428db282c fix: Remove the onRenderError prop and add an ErrorBoundary component 2019-01-08 13:32:08 +01:00
Erik Sundell f9f51d6819 replace fragment with empty jsx tags 2019-01-08 13:00:31 +01:00
Erik Sundell e71e2b3035 refactoring tests 2019-01-08 12:52:47 +01:00
Erik Sundell 803d546c70 ugly fix. will be removed later on 2019-01-08 12:44:43 +01:00
Daniel Lee 8e8b759b21 adds note for #13914 and #14581 2019-01-08 10:47:14 +01:00
Daniel Lee f95b4b3882 Merge pull request #14735 from challengerdeep/14581_fix-stackdriver-series-aggregation-merge
Fix stackdriver aggregation series merge
2019-01-08 10:40:37 +01:00
Peter Holmberg abb98a25e4 moved all units 2019-01-08 10:35:10 +01:00
Johannes Schill bcb94cc0ec fix: GraphPanel should be a PureComponent 2019-01-08 10:30:00 +01:00
Erik Sundell d6e7fccc97 fix more broken tests 2019-01-08 10:00:10 +01:00
Johannes Schill 4f943687d8 feat: Display error when plot fail to render 2019-01-08 09:55:23 +01:00
Erik Sundell c964d6d7ef wip: fix broken tests 2019-01-08 08:51:34 +01:00
Peter Holmberg 36e4bf5985 adding more units and functions 2019-01-07 17:00:10 +01:00
Torkel Ödegaard 56edba5a63 Merge pull request #14746 from jaken551/master
14722 - removing unnecessary arn check that breaks assume role featur…
2019-01-07 16:49:35 +01:00
Torkel Ödegaard a9077e1a1c Merge pull request #14758 from grafana/explore/run-query-button-glitch-fix
Remove the jump effect on run query button
2019-01-07 16:15:48 +01:00
Dominik Prokop 96be5fe8a3 Remove the jump effect on run query button
Caused by the return and loading spinner icons having different widths. Used fa-fw helper class to ensure fixed width on icons. Also, made the spacing between icon and button label slightly smaller, as the rotated level-down icon used as return icon has significantly smaller width compared to the loading spinner and it looked oddly far from the label as compared to timepicker's icon
2019-01-07 15:26:43 +01:00
Erik Sundell 87cb3d4caa ugly temporary fix for scope issue. will be removed later on 2019-01-07 14:52:36 +01:00
Erik Sundell e75aec9954 refactoring 2019-01-07 14:51:20 +01:00
Erik Sundell e61fa37db4 fix filter bug 2019-01-07 14:15:53 +01:00
Erik Sundell 49144f07e4 Merge branch '14293-metric-display-names' into reactify-stackdriver
# Conflicts:
#	public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
#	public/app/plugins/datasource/stackdriver/partials/query.editor.html
#	public/app/plugins/datasource/stackdriver/partials/query.filter.html
#	public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
#	public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
2019-01-07 13:59:36 +01:00
Johannes Schill 0b89f81609 fix: Light theme corner bg color update 2019-01-07 13:56:36 +01:00
Erik Sundell 4d07f56354 set max width on the whole menu list instead 2019-01-07 13:46:15 +01:00
Johannes Schill a6abe50dba Merge branch '14528-panel-errors' of https://github.com/grafana/grafana into 14528-panel-errors
# Conflicts:
#	public/app/features/dashboard/dashgrid/DataPanel.tsx
2019-01-07 13:41:22 +01:00
Erik Sundell 9ec6831713 bind array instead of function 2019-01-07 13:37:39 +01:00
Johannes Schill 79fd8a7eda feat: Add "theme" to Tooltip 2019-01-07 13:31:50 +01:00
Johannes Schill dadbaccfeb Notify user on query error 2019-01-07 13:29:10 +01:00
Johannes Schill 5143a2669d feat: Add "theme" to Tooltip 2019-01-07 13:05:27 +01:00
Erik Sundell 92d6442948 Revert "Revert "add max width to group header description""
This reverts commit d25138060f.
2019-01-07 11:44:10 +01:00
Erik Sundell d25138060f Revert "add max width to group header description"
This reverts commit 86a39183ee.
2019-01-07 11:27:48 +01:00
Erik Sundell 7b4b1a4f90 remove not used property 2019-01-07 11:26:06 +01:00
Erik Sundell 899811a934 fix broken tests 2019-01-07 11:26:06 +01:00
Erik Sundell 126ceb9780 use correct type for select option 2019-01-07 11:26:06 +01:00
Erik Sundell 4928984825 set issearchable default value to true 2019-01-07 11:26:06 +01:00
Erik Sundell 102a130a2d make variable type more slim 2019-01-07 11:26:06 +01:00
Erik Sundell 786df7920e remove group name from select component. let the parent set group name instead 2019-01-07 11:26:06 +01:00
Erik Sundell 03856b4e55 move component to components dir. also move directive registration out from datasource 2019-01-07 11:26:06 +01:00
Erik Sundell 58bea1de79 add template variable type 2019-01-07 11:26:06 +01:00
Erik Sundell 96d65b55b6 rename template variables prop 2019-01-07 11:26:06 +01:00
Erik Sundell ff762c213f rename selected prop 2019-01-07 11:26:06 +01:00
Erik Sundell 3ca5abf5e9 rename searchable prop 2019-01-07 11:26:06 +01:00
Erik Sundell 1e5f2f56e0 improve component performance 2019-01-07 11:26:05 +01:00
Erik Sundell 86a39183ee add max width to group header description 2019-01-07 11:26:05 +01:00
Erik Sundell 5eb22388c3 remove debug logging 2019-01-07 11:26:05 +01:00
Erik Sundell 243c4bfe29 rollback test state to before template variables were added 2019-01-07 11:26:05 +01:00
Erik Sundell 2b8185cb80 cleanup 2019-01-07 11:26:05 +01:00
Erik Sundell 02b745f106 move template variable logic to component 2019-01-07 11:26:05 +01:00
Erik Sundell d42e39a072 remove extra arrow div 2019-01-07 11:26:05 +01:00
Erik Sundell bdf2573db9 fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2019-01-07 11:26:05 +01:00
Erik Sundell 93bc7e8fa5 align input widths 2019-01-07 11:26:05 +01:00
Erik Sundell b9b25e766f remove console log 2019-01-07 11:26:05 +01:00
Erik Sundell a441251cf5 rename directive 2019-01-07 11:26:04 +01:00
Erik Sundell b385c105fe remove linebreak 2019-01-07 11:26:04 +01:00
Erik Sundell 793d3d9afa remove old group heading 2019-01-07 11:26:04 +01:00
Erik Sundell 07f0d90718 use new generic picker 2019-01-07 11:26:04 +01:00
Erik Sundell 1090e0ae2f remove on metric type change 2019-01-07 11:26:04 +01:00
Erik Sundell de9ace731d fix remove filter bug 2019-01-07 11:26:04 +01:00
Erik Sundell d632be849a use same color for label as in explore dropdown 2019-01-07 11:26:03 +01:00
Erik Sundell 329d4652fb cleanup query filter 2019-01-07 11:26:03 +01:00
Erik Sundell b683a19ff6 update failing tests 2019-01-07 11:26:03 +01:00
Erik Sundell 2bc38b7907 remove redundant default value 2019-01-07 11:26:03 +01:00
Erik Sundell caedbc67b8 use new option group in aggregation directive 2019-01-07 11:26:03 +01:00
Erik Sundell eea91d2885 remove redundant default value 2019-01-07 11:26:03 +01:00
Erik Sundell 1f3f336352 wip: add option group component 2019-01-07 11:26:02 +01:00
Erik Sundell d75860a72c wip: add basic option header 2019-01-07 11:26:02 +01:00
Erik Sundell ad4f39101a Wrap react select component in angular directive 2019-01-07 11:26:02 +01:00
Torkel Ödegaard cfd1467a76 Merge pull request #14750 from grafana/gometalinter-fixes
Fixed new gometalinter issues
2019-01-07 11:20:08 +01:00
Torkel Ödegaard 85ecf54751 updated scrollbar snapshot 2019-01-07 11:19:44 +01:00
Erik Sundell 4340e81605 remove not used files 2019-01-07 11:06:36 +01:00
Torkel Ödegaard c0e7e54b81 Merge pull request #14747 from m0nhawk/patch-1
fix JSON in responses for Admin API documentation
2019-01-07 11:03:49 +01:00
Torkel Ödegaard 0a936a55b4 Fixed new gometalinter issues 2019-01-07 11:01:31 +01:00
Torkel Ödegaard cfa3e05eee Merge pull request #14745 from grafana/legend-firefox-fix
Fixed issue with cut legend in firefox & mobile devices,
2019-01-07 08:20:37 +01:00
Andrew Prokhorenkov 294fb7b3bc fix JSON in responses for Admin API documentation 2019-01-06 16:57:44 -06:00
jaken551 64163f0198 14722 - removing unnecessary arn check that breaks assume role feature in other AWS partitions 2019-01-06 15:21:58 -05:00
Torkel Ödegaard 179b19c71b Fixed issue with cut legend in firefox & mobile devices, fixes #14744 and #14489 2019-01-06 17:03:38 +01:00
Torkel Ödegaard 0affb23cb1 Merge pull request #14740 from simPod/some-cleanups
Some cleanup
2019-01-05 16:39:31 +01:00
Simon Podlipsky c39dc1fb15 Some cleanup 2019-01-05 15:25:07 +01:00
tpetr db61fc1dd1 EqualFold() 2019-01-05 00:17:31 -05:00
tpetr 32dfc4e8b1 forgot go fmt 2019-01-05 00:02:15 -05:00
tpetr 5bc8d50864 pull connection string args from url instead 2019-01-04 23:52:36 -05:00
Michael Inthilith 9759ee53ca Add mean on distribution as well 2019-01-04 16:58:27 +01:00
Leonard Gram dd6f606cda docs: updated debian and centos repo. 2019-01-04 16:36:32 +01:00
Michael Inthilith 1eca81139b Fix stackdriver aggregation series merge
Fixes #14581
2019-01-04 16:05:17 +01:00
Peter Holmberg ffc9b7ac03 first stuff 2019-01-04 15:45:39 +01:00
Ander Arguiñano 49133b0012 Updated documentation for new macros 2019-01-04 14:36:07 +01:00
Torkel Ödegaard 2de57f095c Merge pull request #14707 from grafana/14388/alert-tab-ux-update
Alert tab ux update
2019-01-04 12:53:08 +01:00
Torkel Ödegaard bb15eb3091 Merge pull request #14727 from simPod/fix-timepicker-2
Fixed timepicker css issue introduced by PR #14700 and remove hotfix …
2019-01-04 12:41:23 +01:00
Torkel Ödegaard e0c28ba770 Minor refactoring of EditorTabBody 2019-01-04 12:38:50 +01:00
Simon Podlipsky 35f6f50f40 Fixed timepicker css issue introduced by PR #14700 and remove hotfix from 297241c 2019-01-04 12:24:22 +01:00
Torkel Ödegaard f749ced36e AlertTab style fixes 2019-01-04 12:18:49 +01:00
Torkel Ödegaard 2eeba9dae1 Updated alert tab layout & markup 2019-01-04 11:57:16 +01:00
Torkel Ödegaard 769e9f2d8e Merge pull request #14725 from grafana/14719/gauge-issues
14719/gauge issues
2019-01-04 10:57:03 +01:00
Torkel Ödegaard 0ca0670e00 Changed datasource list page default layout mode 2019-01-04 09:58:24 +01:00
Torkel Ödegaard 297241c4ab Fixed timepicker css issue introduced by PR #14700 2019-01-04 09:35:16 +01:00
Ander Arguiñano 089d85af63 Added macros to mysql 2019-01-03 22:29:57 +01:00
Ander Arguiñano 3801a75131 FIxed syntaxis mistake unixEpochNanoFrom and unixEpochNanoTo 2019-01-03 22:25:10 +01:00
Ander Arguiñano ed6782402b Merge remote-tracking branch 'upstream/master' into nanosecond-postgresql 2019-01-03 21:48:10 +01:00
Ander Arguiñano b4eac406d5 Added previous macros to mssql 2019-01-03 21:43:08 +01:00
Ander Arguiñano 9105625f24 Added unixEpochNanoTo and unixEpochNanoFrom macros to postgresql 2019-01-03 21:31:47 +01:00
Ander Arguiñano 4d8d2a9690 Renamed unixEpochFilterNano to unixEpochNanoFilter 2019-01-03 20:40:17 +01:00
Erik Sundell 0c178f8623 cleanup 2019-01-03 16:21:20 +01:00
Erik Sundell cc7b754e77 add aggregation tests 2019-01-03 16:00:42 +01:00
Erik Sundell d23c3d2b64 add tests 2019-01-03 15:12:03 +01:00
Peter Holmberg 44e2fd4b22 Fix issue with value disappearing when selecting stat 2019-01-03 14:31:45 +01:00
Peter Holmberg 4892d3f54b Fixing issue with value color being wrong 2019-01-03 14:21:58 +01:00
Pavel ea4223f923 Merge pull request #5 from grafana/master
Update master
2019-01-03 12:33:57 +02:00
Peter Holmberg 168b8c389d Merge remote-tracking branch 'origin/master' into 14388/alert-tab-ux-update 2019-01-03 11:29:03 +01:00
Torkel Ödegaard 5d3f4422c5 initial design for way to build value formats lazily and a backward compatability layer via Proxy 2019-01-03 09:39:46 +01:00
Erik Sundell 3ce4287e8c fix template variable bug 2019-01-03 09:15:49 +01:00
Torkel Ödegaard 3e873a2500 Merge pull request #14710 from grafana/fixed-gometalinter
Fixed new gotmetalinter warning
2019-01-03 07:23:45 +01:00
Torkel Ödegaard 873a77ed3c Merge pull request #14712 from svenklemm/postgres_subsecond_timerange
Don't cut off subsecond precision for postgres macros
2019-01-03 07:20:07 +01:00
ryan 6435df0a22 Merge remote-tracking branch 'grafana/master'
* grafana/master: (54 commits)
  s/initialDatasourceId/initialDatasource/
  Fixed issues with panel size in edit mode, fixes #14703
  Tweak datetime picker layout for mobile
  Explore: Remember last use datasource
  Update yarn.lock
  Logs data model: add more log levels
  Review feedback
  Explore: fix loading indicator z-index on panel container
  Loki: change query row to be single field again
  Explore: logging UI style fixes
  Loki: query limit configurable in datasource
  Removed rxjs compat
  ldap: adds extra debug logging
  adds orgId to user dto for provisioned dashboards
  Update rxjs
  closes the body properly on successful webhooks
  makes cache mode configurable
  Fix general tab typos
  added node-sass as dev dependency, needed after I removed grunt-sass
  Husky and sasslint fixes, fixes #14638
  ...
2019-01-02 17:04:54 -08:00
Sven Klemm 4c51e8df20 Don't cut off subsecond precision for postgres macros
Change time format to RFC3339Nano for $__timeFilter, $__timeFrom and
$__timeTo macros
2019-01-02 23:38:09 +01:00
Ander Arguiñano 1a67a8db80 Nanosecond timestamp support postgresql 2019-01-02 23:00:21 +01:00
Erik Sundell 93d2588c22 remove not used file 2019-01-02 20:58:03 +01:00
Torkel Ödegaard 80e441f48b Fixed new gotmetalinter warning 2019-01-02 19:17:35 +01:00
tpetr a693d42e31 add support for defining additonal database connection string args via extra_connection_string_args 2019-01-02 13:02:40 -05:00
Torkel Ödegaard a7d4e6caa3 Merge pull request #14699 from grafana/davkal/fix-14398
Explore: Remember last used datasource
2019-01-02 18:59:44 +01:00
Peter Holmberg 6b5f9d5821 clear history 2019-01-02 16:07:29 +01:00
Erik Sundell 1ab9fc871c cleanup. remove comments, not used files etc 2019-01-02 15:35:36 +01:00
Peter Holmberg e7d9bbf781 state history tab 2019-01-02 15:22:22 +01:00
Erik Sundell 0e49225d1d merge from 14293-metric-display-names 2019-01-02 15:07:38 +01:00
Erik Sundell b7503407e6 fix broken tests 2019-01-02 13:03:21 +01:00
Erik Sundell 4dbd113e20 use correct type for select option 2019-01-02 13:03:21 +01:00
Erik Sundell b22bf9359f set issearchable default value to true 2019-01-02 13:03:21 +01:00
Erik Sundell 681f1f31e1 make variable type more slim 2019-01-02 13:03:21 +01:00
Erik Sundell d741295795 remove group name from select component. let the parent set group name instead 2019-01-02 13:03:21 +01:00
Erik Sundell e180cf54ce move component to components dir. also move directive registration out from datasource 2019-01-02 13:03:20 +01:00
Erik Sundell 4662335f80 add template variable type 2019-01-02 13:03:20 +01:00
Erik Sundell 70071e5dad rename template variables prop 2019-01-02 13:03:20 +01:00
Erik Sundell cf50cf167c rename selected prop 2019-01-02 13:03:20 +01:00
Erik Sundell ed673d35f5 rename searchable prop 2019-01-02 13:03:20 +01:00
Erik Sundell e4d18a1933 improve component performance 2019-01-02 13:03:20 +01:00
Erik Sundell 5f8ccfb9a0 add max width to group header description 2019-01-02 13:03:20 +01:00
Erik Sundell 53ac3c8fd2 remove debug logging 2019-01-02 13:03:20 +01:00
Erik Sundell c70e90cb48 rollback test state to before template variables were added 2019-01-02 13:03:20 +01:00
Erik Sundell 01fc950511 cleanup 2019-01-02 13:03:19 +01:00
Erik Sundell 00a763511e move template variable logic to component 2019-01-02 13:03:19 +01:00
Erik Sundell 3f05364eb9 remove extra arrow div 2019-01-02 13:03:19 +01:00
Erik Sundell e7670cacf4 fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2019-01-02 13:03:19 +01:00
Erik Sundell 9715260151 align input widths 2019-01-02 13:03:19 +01:00
Erik Sundell 3afe8a0763 remove console log 2019-01-02 13:03:18 +01:00
Erik Sundell 55f558cb7c rename directive 2019-01-02 13:03:18 +01:00
Erik Sundell 843e9fb4dc remove linebreak 2019-01-02 13:03:18 +01:00
Erik Sundell 566001aaf2 remove old group heading 2019-01-02 13:03:18 +01:00
Erik Sundell 4734788db4 use new generic picker 2019-01-02 13:03:17 +01:00
Erik Sundell 478cfc195a remove on metric type change 2019-01-02 13:03:17 +01:00
Erik Sundell 014457c486 fix remove filter bug 2019-01-02 13:03:17 +01:00
Erik Sundell 85a434568f use same color for label as in explore dropdown 2019-01-02 13:03:17 +01:00
Erik Sundell f68db4eded cleanup query filter 2019-01-02 13:03:17 +01:00
Erik Sundell b6c6cc1ff6 update failing tests 2019-01-02 13:03:17 +01:00
Erik Sundell 615fa6fc7d remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell 4d19ac5c02 use new option group in aggregation directive 2019-01-02 13:03:16 +01:00
Erik Sundell 406c0d15a5 remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell b5d6cd1cc8 wip: add option group component 2019-01-02 13:03:16 +01:00
Erik Sundell 488e92e7f5 wip: add basic option header 2019-01-02 13:03:16 +01:00
Erik Sundell 70c2efd711 Wrap react select component in angular directive 2019-01-02 13:03:15 +01:00
David Kaltschmidt 757d6f322e s/initialDatasourceId/initialDatasource/ 2019-01-02 11:32:12 +00:00
Torkel Ödegaard 24ee10ca01 Merge pull request #14705 from grafana/panel-size-fixes
Fixed issues with panel size in edit mode, fixes #14703
2019-01-02 11:48:02 +01:00
Peter Holmberg ce01bd696e add alert in react instead of angular 2019-01-02 10:57:12 +01:00
Torkel Ödegaard 9aef3f4fb1 Fixed issues with panel size in edit mode, fixes #14703 2019-01-02 10:54:57 +01:00
Peter Holmberg d9c93e572e hide protip if not defined 2019-01-02 10:50:52 +01:00
Erik Sundell fd88f637b2 fix filter bug 2019-01-02 09:41:26 +01:00
Erik Sundell f9380a2634 add help text component 2019-01-02 09:36:32 +01:00
Torkel Ödegaard f59541b490 Merge pull request #14698 from simPod/update-lock
Update yarn.lock
2019-01-01 15:39:17 +01:00
Torkel Ödegaard 9e91d91788 Merge pull request #14689 from grafana/davkal/loki-limit
Loki: query limit configurable in datasource
2019-01-01 15:38:59 +01:00
Torkel Ödegaard 46f9418605 Merge pull request #14696 from grafana/davkal/fix-14686
Logs data model: add more log levels
2019-01-01 15:37:37 +01:00
Torkel Ödegaard 940692189b Merge pull request #14700 from simPod/timepicker
Tweak datetime picker layout for mobile
2019-01-01 15:33:28 +01:00
Simon Podlipsky a5c05d273f Tweak datetime picker layout for mobile 2018-12-31 19:47:42 +01:00
David Kaltschmidt 67ebdcbcc3 Explore: Remember last use datasource
- use local storage to store last used database
- renamed `datasourceName` property to `initialDatasourceId` for consistency
- adapted tests
2018-12-31 18:30:32 +00:00
Simon Podlipsky 5f4eeea481 Update yarn.lock 2018-12-31 19:17:07 +01:00
Dan Cech efa738ddf6 Merge pull request #14540 from grafana/session-skip-update
only update session in mysql database when required
2018-12-31 11:54:04 -05:00
Torkel Ödegaard 22399b336f Merge pull request #14577 from marefr/14351_db_migration
fix only create/drop database indices if not exists/exists
2018-12-31 16:20:07 +01:00
David Kaltschmidt a364487b3a Logs data model: add more log levels
- add `eror` used in github.com/inconshreveable/log15 (used by Grafana as well)
- add levels from SYSLOG
2018-12-31 14:44:13 +00:00
David Kaltschmidt f4b4ee3ff8 Review feedback 2018-12-31 14:10:45 +00:00
David b712337a3b Merge pull request #14693 from grafana/davkal/loki-single-query
Loki: change query row to be single field again
2018-12-31 14:55:44 +01:00
Torkel Ödegaard 75f9d173ff Merge pull request #14691 from grafana/davkal/fix-14690
Explore: logging UI style fixes
2018-12-31 14:34:18 +01:00
Torkel Ödegaard 68897c18b2 Merge pull request #14694 from grafana/davkal/fix-14668
Explore: fix loading indicator z-index on panel container
2018-12-31 14:33:52 +01:00
David Kaltschmidt 652c149ca2 Explore: fix loading indicator z-index on panel container
- existing z-index placed the loading indicator above dropdowns of the panel children
- removed z-index for natural ordering
2018-12-31 12:55:03 +00:00
David Kaltschmidt 32438c4716 Loki: change query row to be single field again
- tried split selector and search for a week, and it did not feel natural
- keeping some of the original modifications in QueryField from splitting PR
- adapted CheatSheet and placeholder text
- added new label selector state: No labels found
2018-12-31 12:38:13 +00:00
David Kaltschmidt 39833b0df7 Explore: logging UI style fixes
- baseline aligment for meta field labels
- use variables for font sizes and margins
2018-12-31 12:05:07 +00:00
David Kaltschmidt 26a5e07737 Loki: query limit configurable in datasource
- Loki queries must contain a limit
- this change makes this limit configurable in the datasource
- keep default at 1000, add tooltip on why inc/dec makes sense
- added tests
2018-12-31 11:25:28 +00:00
Torkel Ödegaard 6f998541c8 Merge branch 'master' of github.com:grafana/grafana 2018-12-31 09:00:39 +01:00
Torkel Ödegaard 8a2d1b98e9 Removed rxjs compat 2018-12-31 08:57:01 +01:00
Torkel Ödegaard e18256e417 Merge branch 'rxjs-update' of https://github.com/simPod/grafana into simPod-rxjs-update 2018-12-31 08:40:24 +01:00
Torkel Ödegaard 983b85139c Merge pull request #14665 from bergquist/sqlite_cache_mode_setting
WIP: makes cache mode configurable
2018-12-31 08:35:27 +01:00
Torkel Ödegaard 6eb9f83647 Merge pull request #14678 from bergquist/set_orgid_for_provisioned_dashboards
Adds orgId to user dto for provisioned dashboards
2018-12-31 08:34:01 +01:00
Daniel Lee ce50e9331a ldap: adds extra debug logging 2018-12-30 22:53:00 +01:00
Erik Sundell 5ba429387f reactify annotation query editor 2018-12-28 19:45:24 +01:00
bergquist 9895b1e6d0 adds orgId to user dto for provisioned dashboards 2018-12-28 10:49:00 +01:00
Simon Podlipsky d42f821c87 Update rxjs 2018-12-27 20:37:44 +01:00
Carl Bergquist 136f6986e1 Merge pull request #14666 from bergquist/close_body
Closes the body properly on successful webhooks
2018-12-27 16:22:39 +01:00
bergquist 24636da800 closes the body properly on successful webhooks
this commit also adds a test docker container
for receiving alerting web hook requests
2018-12-27 16:08:13 +01:00
Carl Bergquist b798a5412b Merge pull request #14661 from pfree/fix_typo
Fix general tab typos
2018-12-27 14:31:08 +01:00
bergquist 74124ec8ed makes cache mode configurable
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
2018-12-27 10:48:11 +01:00
Patrick Freeman ca7f75f353 Fix general tab typos 2018-12-26 13:36:12 -05:00
Torkel Ödegaard 8a976f5cb4 Merge pull request #14656 from grafana/husky-and-sasslint-fixes
Husky and sasslint fixes
2018-12-26 08:13:35 +01:00
Torkel Ödegaard 9cd449ed52 added node-sass as dev dependency, needed after I removed grunt-sass 2018-12-25 21:11:18 +01:00
Torkel Ödegaard ce0dcd5cab Husky and sasslint fixes, fixes #14638 2018-12-25 20:20:59 +01:00
Torkel Ödegaard 66a13b281c Merge branch 'grafana-lib' 2018-12-25 19:26:46 +01:00
Torkel Ödegaard 98d26354c1 Added a form component to @grafana/ui 2018-12-25 11:42:23 +01:00
Torkel Ödegaard 2dfa3269c3 created visualizations folder 2018-12-25 10:20:20 +01:00
Torkel Ödegaard 493714c27d Fixed JQuery typing issues 2018-12-25 09:59:23 +01:00
Torkel Ödegaard 19da963a19 Typings issues 2018-12-25 08:55:44 +01:00
Torkel Ödegaard a38490f4b2 wip: moving react graph component to grafana/ui 2018-12-24 14:14:06 +01:00
Torkel Ödegaard 513434cada Merge pull request #14652 from grafana/test-frontend-change
Don't do a full frontend release build in test-frontend
2018-12-24 12:37:17 +01:00
Torkel Ödegaard 21a25f2c27 Don't do a full frontend release build in test-frontend job, added typescheck (tsc noEmit) instead, fixes #14639 2018-12-24 07:12:49 +01:00
Torkel Ödegaard 4b323d9879 Moved sass for component to @grafana/ui lib 2018-12-24 07:05:18 +01:00
Torkel Ödegaard 17de1f2887 Merge pull request #14646 from grafana/fix-dashboard-links
Fixed dashboard links not updating after variable or time range change
2018-12-23 20:41:51 +01:00
Torkel Ödegaard 0fd403a783 Merge pull request #14647 from grafana/explore-options-margin-increase
Increased margin between controls in logs panel
2018-12-23 17:45:49 +01:00
Torkel Ödegaard a02b4b47b6 Moving a couple of types to @grafana/ui 2018-12-23 09:15:32 +01:00
Torkel Ödegaard 0ff572efbf Testing moving out one type to grafana/ui 2018-12-23 08:28:37 +01:00
Torkel Ödegaard 270d52495d Increased margin between controls in logs panel, fixes #14637 2018-12-23 07:18:11 +01:00
Torkel Ödegaard 002f57ae00 Fixed dashboard links not updating after variable or time range change, fixes #14493 2018-12-23 07:11:24 +01:00
Torkel Ödegaard 4bb8249ffc Merge pull request #14627 from cykl/influxdb-timezone-clause
Add support for InfluxDB's time zone clause
2018-12-23 07:03:48 +01:00
Torkel Ödegaard a138bf27d1 Merge pull request #14642 from jacobrichard/master
Update/Improve Docs for Auth Proxy Whitelist
2018-12-23 07:01:41 +01:00
Torkel Ödegaard ef219dd72b Merge pull request #14645 from grafana/fix-tooltip-placement
Fixed group button tooltip placement from auto to bottom
2018-12-23 07:00:56 +01:00
Torkel Ödegaard 41712c3957 Fixed group button tooltip placement from auto to bottom, fixes #14634 2018-12-23 06:46:26 +01:00
Jacob Richard 47c0b5770b Removing erroneous backtick in docs 2018-12-22 18:18:15 -06:00
Jacob Richard b785b06598 Updating docs for auth_proxy whitelist CIDR support 2018-12-22 18:17:32 -06:00
David b05e7aaecb Merge pull request #14636 from grafana/davkal/fix-14635
Loki: fix timestamp field
2018-12-22 17:52:59 +01:00
David Kaltschmidt d1dec8bd44 Add timestamp back to log entry type 2018-12-22 17:36:35 +01:00
Dan Cech b8fdacd81f Update public/app/plugins/datasource/loki/result_transformer.ts
Co-Authored-By: davkal <david.kaltschmidt@gmail.com>
2018-12-22 17:28:51 +01:00
David Kaltschmidt e694604be5 Loki: fix timestamp field
- timestamp was renamed to `ts` in grafana/loki#152
- renamed here in result transformer and tests
2018-12-22 17:19:58 +01:00
David b2401e37fa Merge pull request #14414 from grafana/davkal/explore-logging-search
Explore: Split logging query into selector and search
2018-12-22 17:00:57 +01:00
Torkel Ödegaard f8e2e11734 Merge pull request #14631 from grafana/firefox-height-bugfix
Fixed panel height & scroll issue with flexbox in firefox,
2018-12-22 09:54:58 +01:00
Torkel Ödegaard 9aa2764753 Fixed panel height & scroll issue with flexbox in firefox, fixes #14620 2018-12-22 08:58:08 +01:00
Erik Sundell 8a916757d7 remove segment srv prop 2018-12-21 23:28:21 +01:00
Erik Sundell b9cf15786d use ds template srv reference 2018-12-21 23:21:55 +01:00
Erik Sundell 2f342b8917 remove not used stuff 2018-12-21 23:07:46 +01:00
Erik Sundell 31254e1c72 add event handler 2018-12-21 22:04:46 +01:00
Erik Sundell 0515605b9a add help component 2018-12-21 21:38:46 +01:00
Clément MATHIEU c29c9d1664 Add support for InfluxDB's time zone clause (backend) 2018-12-21 16:49:01 +01:00
Peter Holmberg acf8390d57 note to future me 2018-12-21 14:57:54 +01:00
Peter Holmberg 4002f80ab8 delete works 2018-12-21 14:56:49 +01:00
Torkel Ödegaard 7268f16c54 grunt test task update 2018-12-21 14:37:38 +01:00
Jürgen Kreileder 41eb0ba52e Add support for InfluxDB's time zone clause 2018-12-21 14:37:02 +01:00
Torkel Ödegaard 52f583fee7 @grafana/ui lib now contains one components, seperate lint & tsc steps 2018-12-21 14:23:32 +01:00
Marcus Efraimsson 8b4083a602 changelog: add notes about closing #14519 2018-12-21 13:01:25 +01:00
Marcus Efraimsson 45e92a116d Merge pull request #14605 from kjedamzik/add-blood-glucose-level-units
Add units for blood sugar concentration 💉
2018-12-21 12:54:43 +01:00
Torkel Ödegaard 2fec5c7577 Grafana ui lib is starting to work 2018-12-21 12:27:43 +01:00
Peter Holmberg 6aacd0734b typings and renamings 2018-12-21 11:57:21 +01:00
Peter Holmberg 25a46c60f1 Merge branch 'master' into 14388/alert-tab-ux-update 2018-12-21 11:25:09 +01:00
Peter Holmberg bbd77d8f0b adding extra props 2018-12-21 11:24:31 +01:00
Torkel Ödegaard 6e66b2b906 breaking up grafana into multiple packages poc 2018-12-20 16:56:46 +01:00
Erik Sundell e2ed163779 add project and help component 2018-12-20 16:55:02 +01:00
Erik Sundell 06f771afd3 add alias by component 2018-12-20 15:59:21 +01:00
Erik Sundell 861f911cda add alignment periods component 2018-12-20 13:36:10 +01:00
Erik Sundell 7a31076f09 cleanup aggregation picker 2018-12-20 13:27:47 +01:00
Erik Sundell 1452bc2e8a move alignment population code to parent component. make alignment a stateless component instead. 2018-12-20 11:26:05 +01:00
Erik Sundell ec68c65660 flatten target obj 2018-12-20 11:00:16 +01:00
Pavel c041bf2488 Merge pull request #4 from grafana/master
Update master
2018-12-20 11:57:39 +02:00
Torkel Ödegaard f089c7ee5e Grafana ui library poc 2018-12-20 09:25:04 +01:00
Marcus Efraimsson b45f72a140 elasticsearch: support bucket script pipeline aggregations 2018-12-20 01:24:36 +01:00
Kofi Jedamzik 281312ffcd Add units for blood sugar concentration 💉 2018-12-19 22:23:25 +01:00
Erik Sundell 095407c8cf on deselect when reducer is set to none 2018-12-19 21:08:38 +01:00
ryan 9c086be591 Merge remote-tracking branch 'grafana/master'
* grafana/master: (41 commits)
  Fixes undefined issue with angular panels and editorTabs
  changelog: adds note about closing #14562
  Update field name
  Add documentation
  Rename the setting and add description
  export init notifier func
  Increase recent and starred limit in search and home dashboard, closes #13950
  changelog: adds note about closing #14486
  Panel help view fixes
  Add min/max height when resizing and replace debounce with throttle
  changelog: adds note about closing #14546
  Adding tests for auth proxy CIDR support
  changelog: adds note about closing #14109
  fix signed in user for orgId=0 result should return active org id
  Another take on resizing the panel, now using react-draggable
  Raise datasources number to 5000
  copy props to state to make it visible in the view
  refactor to not crash when no links
  updating snaps
  renaming component
  ...
2018-12-19 11:35:44 -08:00
Erik Sundell 945b0aeb86 add alignment component 2018-12-19 17:12:50 +01:00
Torkel Ödegaard 2325c5dbed Merge pull request #14603 from grafana/minor-angular-editmode-fix
Fixes undefined issue with angular panels and editorTabs
2018-12-19 17:09:23 +01:00
Torkel Ödegaard 5b83f6d49d Fixes undefined issue with angular panels and editorTabs 2018-12-19 17:00:26 +01:00
bergquist 7637ea55e4 changelog: adds note about closing #14562 2018-12-19 16:11:35 +01:00
Erik Sundell 603ef1c37d refactor aggregation picker 2018-12-19 16:08:18 +01:00
Carl Bergquist c201fc170f Merge pull request #14563 from tdabasinskas/broken_oauth_provider
Support OAuth providers that are not RFC6749 compliant
2018-12-19 16:05:53 +01:00
Erik Sundell 9b1b4c09f5 use render props pattern 2018-12-19 15:54:45 +01:00
Tomas Dabasinskas eb517a3791 Update field name 2018-12-19 15:36:45 +02:00
Torkel Ödegaard 71837fe137 Merge pull request #12681 from simPod/fix-variable-array-display
Fix array display from url
2018-12-19 14:34:21 +01:00
Tomas Dabasinskas e8823f71b0 Add documentation 2018-12-19 15:29:49 +02:00
Erik Sundell 07dc9d06d7 use template variable prop 2018-12-19 14:29:00 +01:00
Erik Sundell a955caa9ac cleanup 2018-12-19 14:19:27 +01:00
Tomas Dabasinskas 3aa24b3afa Rename the setting and add description 2018-12-19 14:59:33 +02:00
Carl Bergquist 52ccb49167 Merge pull request #14593 from bergquist/export_create_notifier_func
export init notifier func
2018-12-19 13:51:40 +01:00
bergquist 69489993c3 export init notifier func
makes it possible to validate that an notifier can be
initialzed from the provisioning package
2018-12-19 13:38:49 +01:00
Torkel Ödegaard d0f8d034df Quick refactoring of time picker styles, needs a much bigger redesign 2018-12-19 13:13:46 +01:00
Peter Holmberg f3ba3b4df0 render editor toolbar buttons 2018-12-19 13:09:53 +01:00
Johannes Schill f95359fb34 Notify user on query error 2018-12-19 12:58:10 +01:00
Torkel Ödegaard 1260301099 Merge pull request #14589 from grafana/search-increase-recent-starred-limit
Increase recent and starred limit in search and home dashboard
2018-12-19 12:09:54 +01:00
Torkel Ödegaard 9e92609313 Merge pull request #14113 from cinaglia/fix-csv-decimal-places
Retain decimal precision when exporting CSV
2018-12-19 11:56:27 +01:00
Torkel Ödegaard 16ad0f65ea Increase recent and starred limit in search and home dashboard, closes #13950 2018-12-19 11:40:38 +01:00
Torkel Ödegaard cbeefcd376 Merge pull request #14574 from grafana/14543_org_redirect
fix signed in user for orgId=0 result should return active org id
2018-12-19 11:31:06 +01:00
Torkel Ödegaard 36154e59b0 Merge pull request #14571 from oiooj/pr-ds-limit
Raise datasources number to 5000
2018-12-19 11:26:16 +01:00
Torkel Ödegaard 6154f89d96 Merge pull request #14587 from grafana/panel-help-fixes
Panel help view fixes
2018-12-19 11:25:12 +01:00
Torkel Ödegaard d21b5899c1 Merge branch 'master' of github.com:grafana/grafana 2018-12-19 11:24:25 +01:00
Torkel Ödegaard 6542bfb83e Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues 2018-12-19 11:21:34 +01:00
Torkel Ödegaard 87cc3902b7 Merge pull request #14558 from hahnjo/flops
Add units for Floating Point Operations per Second
2018-12-19 11:11:14 +01:00
Torkel Ödegaard 8375c23de9 Merge pull request #14569 from grafana/14537/time-range-and-relative-time
Show current values for relative time and time shift
2018-12-19 11:05:42 +01:00
Johannes Schill 9607b27935 changelog: adds note about closing #14486 2018-12-19 11:04:40 +01:00
Torkel Ödegaard 60ea99078e Panel help view fixes 2018-12-19 11:03:54 +01:00
Peter Holmberg 2046309de5 rewrite angular view 2018-12-19 10:42:57 +01:00
Torkel Ödegaard 9fec202668 Merge pull request #14565 from grafana/panel-help-view
Panel help view
2018-12-19 10:25:02 +01:00
Carl Bergquist fdb48b7bbc Merge pull request #14531 from grafana/golang_1.11.4
Upgrade go version to 1.11.4
2018-12-19 10:09:56 +01:00
Torkel Ödegaard 5f2937431f Merge pull request #14572 from grafana/develop-draggable-panel
Another take on resizing the panel, now using react-draggable
2018-12-19 10:07:45 +01:00
Erik Sundell 9e558b70d7 Merge branch '14293-metric-display-names' into reactify-stackdriver
# Conflicts:
#	public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
#	public/app/plugins/datasource/stackdriver/partials/query.editor.html
#	public/app/plugins/datasource/stackdriver/partials/query.filter.html
#	public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
#	public/sass/_grafana.scss
2018-12-19 09:21:35 +01:00
Johannes Schill 9cd0067187 Add min/max height when resizing and replace debounce with throttle 2018-12-19 09:08:56 +01:00
bergquist a6d90151da changelog: adds note about closing #14546 2018-12-19 08:58:14 +01:00
Carl Bergquist 251e80aa5e Merge pull request #14547 from jacobrichard/master
Adding CIDR capability to auth_proxy whitelist
2018-12-19 08:55:03 +01:00
Jacob Richard 34d3086ec8 Adding tests for auth proxy CIDR support 2018-12-18 21:16:29 -06:00
Marcus Efraimsson 12f3c8f9d6 fix only add column if not exists for mysql 2018-12-18 23:02:08 +01:00
bergquist ea84ec6229 changelog: adds note about closing #14109 2018-12-18 22:49:38 +01:00
Carl Bergquist 854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot
Add support for deleting external snapshots from Snapshots List
2018-12-18 22:43:12 +01:00
Marcus Efraimsson a451c20129 fix handling of indices with multiple columns (mysql) 2018-12-18 22:28:27 +01:00
Marcus Efraimsson 09b3014683 fix only create/drop database indices if not exists/exists 2018-12-18 21:47:45 +01:00
Marcus Efraimsson e82b3632f6 fix signed in user for orgId=0 result should return active org id 2018-12-18 20:02:27 +01:00
ryan f7170829ce Merge remote-tracking branch 'grafana/master'
* grafana/master: (421 commits)
  Minor update
  Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id
  changelog: adds note about closing #14548
  Minor cleanup now that angular panel edit is no longer
  Gauge option form markup fixes
  filter out table responses that don't have columns and rows
  enable goto explore from query panel editor for all datasources
  moves migrations to /sqlstore/migrations
  adds integration tests to ci build
  renames main lock function
  clean up integration tests
  change from db_text to nvarchar
  adds server lock package
  initial verison of server lock
  Minor react graph panel refactorings and fixes
  sorting tests for change value
  Fixes issues with user and team picker
  fixing coloring
  remove printed index
  updating test
  ...
2018-12-18 10:56:30 -08:00
Johannes Schill a007730f5d Another take on resizing the panel, now using react-draggable 2018-12-18 17:22:30 +01:00
Dan Cech 3f85901c4a only update session in mysql database when required 2018-12-18 11:19:32 -05:00
Baokun Lee f51222027d Raise datasources number to 5000 2018-12-18 23:59:14 +08:00
Erik Sundell 8e9cd83ee8 improve component performance 2018-12-18 16:56:16 +01:00
Erik Sundell 575d7f8941 add max width to group header description 2018-12-18 16:41:47 +01:00
Peter Holmberg 8f92e23e98 copy props to state to make it visible in the view 2018-12-18 16:39:59 +01:00
Erik Sundell 74c2b22a77 remove debug logging 2018-12-18 16:27:24 +01:00
Erik Sundell 3c2ab68290 rollback test state to before template variables were added 2018-12-18 16:19:49 +01:00
Erik Sundell 7ef0995257 cleanup 2018-12-18 16:09:32 +01:00
Erik Sundell 9507dfe13c move template variable logic to component 2018-12-18 16:01:12 +01:00
Erik Sundell 5a9dd620a6 remove extra arrow div 2018-12-18 15:58:33 +01:00
Peter Holmberg 659b5a3c15 refactor to not crash when no links 2018-12-18 15:30:34 +01:00
Peter Holmberg bf7ba9a4d1 updating snaps 2018-12-18 14:54:50 +01:00
Peter Holmberg 95656e1e95 renaming component 2018-12-18 14:49:59 +01:00
Peter Holmberg a44a07593f panel help working 2018-12-18 14:40:54 +01:00
Victor Cinaglia 48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
Erik Sundell 5e4841cc6e fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2018-12-18 14:30:46 +01:00
Erik Sundell 0c596a0274 align input widths 2018-12-18 13:03:29 +01:00
Tomas Dabasinskas 08c12313fe Update sample and default configs 2018-12-18 13:51:17 +02:00
Tomas Dabasinskas 54b73025dc Add OAuth provider flag to indicate if it's broken 2018-12-18 13:50:37 +02:00
Tomas Dabasinskas 052772ea2e Register BrokenAuthHeaderProviders if needed 2018-12-18 13:48:25 +02:00
Jonas Hahnfeld 0cf3e94934 Add units for Floating Point Operations per Second
This is an important metric for computation throughput in the context
of High Performance Computing (HPC). I've never heard of the kilo
prefix here, nowadays it's mostly measured in MFLOP/s.
2018-12-18 12:11:21 +01:00
Erik Sundell 738fd997ce remove console log 2018-12-18 11:46:07 +01:00
Erik Sundell d23d4c2ca0 rename directive 2018-12-18 11:31:11 +01:00
Torkel Ödegaard a4091813bf Merge pull request #14534 from grafana/14409/threshold-ux-changes
14409/threshold ux changes
2018-12-18 11:30:48 +01:00
Erik Sundell b46be0b638 remove linebreak 2018-12-18 11:28:35 +01:00
Erik Sundell ea1ce578ff remove old group heading 2018-12-18 11:26:42 +01:00
Erik Sundell 8430c5a491 use new generic picker 2018-12-18 11:25:13 +01:00
Torkel Ödegaard e56b478709 Merge pull request #14551 from grafana/explore-ds-fixes
Explore: Datasource fixes
2018-12-18 10:38:31 +01:00
Erik Sundell 47b3901e7d remove on metric type change 2018-12-18 10:37:47 +01:00
Erik Sundell a5f64a5668 fix remove filter bug 2018-12-18 10:37:47 +01:00
Erik Sundell a7bdd757ef use same color for label as in explore dropdown 2018-12-18 10:37:47 +01:00
Erik Sundell 15ba05d7ee cleanup query filter 2018-12-18 10:37:47 +01:00
Erik Sundell 5affc55756 update failing tests 2018-12-18 10:37:46 +01:00
Erik Sundell 8afe48bb3e remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell dcbe12989f use new option group in aggregation directive 2018-12-18 10:37:46 +01:00
Erik Sundell 2ac1fe2a17 remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell fe4c77a8a4 wip: add option group component 2018-12-18 10:37:46 +01:00
Erik Sundell 5370f78ee7 wip: add basic option header 2018-12-18 10:37:46 +01:00
Erik Sundell 73b5bc680f Wrap react select component in angular directive 2018-12-18 10:36:59 +01:00
Torkel Ödegaard e8f9174d08 Minor update 2018-12-18 09:58:27 +01:00
Erik Sundell ad3d36e6b7 Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id 2018-12-18 09:44:51 +01:00
bergquist 3c6bcde8b2 changelog: adds note about closing #14548 2018-12-18 08:22:02 +01:00
Carl Bergquist ac458a4e4b Merge pull request #14511 from grafana/go-ldap-v3
ldap: upgrades go-ldap to v3
2018-12-18 08:18:40 +01:00
Torkel Ödegaard 1b1f8ebadc Merge pull request #14541 from grafana/minor-cleanup
Minor cleanup now that angular panel edit is no longer
2018-12-18 07:36:31 +01:00
Jacob Richard 0b50582b56 Adding CIDR capability to auth_proxy whitelist 2018-12-17 23:43:14 -06:00
Torkel Ödegaard 705cbb4095 Minor cleanup now that angular panel edit is no longer 2018-12-17 21:29:25 +01:00
Torkel Ödegaard 1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +01:00
Peter Holmberg 65db6a7638 toolbaritems viztab 2018-12-17 16:54:29 +01:00
Carl Bergquist 7653d8a197 Merge pull request #14468 from bergquist/db_lock
Infra package for creating distributed lock to make sure functions are executed once even in HA mode.
2018-12-17 16:51:11 +01:00
Erik Sundell 2835c4336d filter out table responses that don't have columns and rows 2018-12-17 16:46:22 +01:00
Torkel Ödegaard 7d248cb415 Merge remote-tracking branch 'origin/master' into 14409/threshold-ux-changes 2018-12-17 16:45:46 +01:00
Erik Sundell 18b39967fc enable goto explore from query panel editor for all datasources 2018-12-17 16:44:57 +01:00
Peter Holmberg cda7897323 started with component for generic panel help 2018-12-17 16:42:02 +01:00
bergquist 7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist dbcc2e868d adds integration tests to ci build 2018-12-17 16:36:57 +01:00
bergquist 11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist c565b018c5 clean up integration tests 2018-12-17 16:36:57 +01:00
bergquist 823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
bergquist dc49bebb00 adds server lock package 2018-12-17 16:36:57 +01:00
bergquist ff136b6ba8 initial verison of server lock 2018-12-17 16:36:57 +01:00
Torkel Ödegaard c0fc236fcb Merge pull request #14535 from grafana/react-graph-changes
React graph changes
2018-12-17 16:29:00 +01:00
Torkel Ödegaard c20e10a584 Merge branch 'master' into 14409/threshold-ux-changes 2018-12-17 16:25:33 +01:00
Torkel Ödegaard 0fe452ec26 Minor react graph panel refactorings and fixes 2018-12-17 15:38:51 +01:00
Torkel Ödegaard cfae98fae2 Merge pull request #14532 from grafana/fixes-to-user-and-team-picker
Fixes issues with user and team picker
2018-12-17 14:56:05 +01:00
Peter Holmberg adebbd9559 sorting tests for change value 2018-12-17 14:37:12 +01:00
Torkel Ödegaard e80a287f7a Merge pull request #14510 from grafana/14484-table-format-string-epochs
In Table Panel, renders epoch string as date if date column style
2018-12-17 14:37:00 +01:00
Torkel Ödegaard e38a04ba9a Fixes issues with user and team picker 2018-12-17 14:31:43 +01:00
Peter Holmberg e7f966d002 fixing coloring 2018-12-17 14:26:19 +01:00
bergquist 17f8be90ae upgrade to golang 1.11.4 2018-12-17 14:25:47 +01:00
Peter Holmberg 98490084a1 remove printed index 2018-12-17 14:18:28 +01:00
Peter Holmberg e11834e950 updating test 2018-12-17 14:16:29 +01:00
Peter Holmberg ade2f297a7 adding threshold 2018-12-17 14:15:04 +01:00
Torkel Ödegaard 0fd92ef6fb Refactoring react graph 2018-12-17 13:55:25 +01:00
Torkel Ödegaard 3efaf52049 Merge pull request #14274 from grafana/develop
Develop (New Panel Edit UX & Explore All Datasources suppport) -> Master
2018-12-17 13:35:59 +01:00
Torkel Ödegaard 1ac81c3ad0 updated dropdown typeahead to place down instead of up, works better when inside scrollable area 2018-12-17 13:08:09 +01:00
Torkel Ödegaard 7455dfcc84 minor style tweak 2018-12-17 12:57:40 +01:00
Erik Sundell f673d60dae Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-17 11:17:58 +01:00
Erik Sundell e84e6740e6 propagate initial state back to explore query runner 2018-12-17 11:17:16 +01:00
Torkel Ödegaard d912677d80 Merge pull request #14520 from Soitora/patch-1
OAuth Title Fix
2018-12-17 07:22:48 +01:00
Simon Mattila c4126f9910 Update gitlab.md
Change title from Google to GitLab
2018-12-17 00:26:23 +01:00
Simon Mattila 5d190769e6 Update github.md
Change title from Google to GitHub
2018-12-17 00:24:52 +01:00
Torkel Ödegaard d7e5582c76 minor style fixes 2018-12-16 10:31:37 -08:00
Torkel Ödegaard e6b8bfe7e6 Updated snapshot 2018-12-16 10:10:25 +01:00
Torkel Ödegaard 72b9cb9b9f Switched to react-select fork 2018-12-16 09:58:37 +01:00
Torkel Ödegaard 660c9fd467 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-16 09:21:15 +01:00
Daniel Lee 167e8815d3 ldap: upgrades go-ldap to v3 2018-12-16 01:05:14 +01:00
Daniel Lee 0ebd5e0c80 table: fixes #14484. Renders epoch string if date column style 2018-12-16 00:03:03 +01:00
Daniel Lee 217596b4a1 changelog: adds note for #14483 2018-12-16 00:01:56 +01:00
Torkel Ödegaard 38b5d7862f Fix for no metrics panels, now goes to viz tab and does not show queries tab 2018-12-15 12:08:33 -08:00
Torkel Ödegaard e99dbefb98 minor style fix 2018-12-15 11:29:50 -08:00
Torkel Ödegaard 1b3a520b94 minor change to table panel edit options 2018-12-15 18:09:18 +01:00
Torkel Ödegaard 68b7b6cd97 minor tweaks to text panel 2018-12-15 17:53:52 +01:00
Torkel Ödegaard f67e0827b2 Fixes and cleanup 2018-12-15 10:04:25 +01:00
Simon Podlipsky 2d296715ec Show predefined time ranges as first in timepicker on small screens 2018-12-15 00:55:24 +01:00
Torkel Ödegaard 9773a2d419 Merge pull request #14502 from banjeremy/13765-annotation-editor-outside-viewport
remove check on axis.used in flot
2018-12-14 21:33:40 +01:00
Torkel Ödegaard 248015c937 code cleanup in add panel, and switched off grid css transforms to fix z-index issuse 2018-12-14 20:53:42 +01:00
Torkel Ödegaard bd2c9853ec minor tweaks to alert tab 2018-12-14 19:34:51 +01:00
Torkel Ödegaard b10f558a99 fixed name of alert tab 2018-12-14 17:45:35 +01:00
Torkel Ödegaard 2cf246f946 removed unnessary test 2018-12-14 17:42:14 +01:00
Torkel Ödegaard 9ac11f1d9d updated add panel a bit 2018-12-14 17:39:33 +01:00
Torkel Ödegaard 9d8d5b18ef Merge remote-tracking branch 'origin/develop-addpanelpanel' into add-panel-rewrite 2018-12-14 17:04:33 +01:00
Torkel Ödegaard b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +01:00
Torkel Ödegaard cf1cd4d60f Merge pull request #14500 from grafana/select-refactor
Select refactor
2018-12-14 16:57:38 +01:00
Torkel Ödegaard 6e2f6701ac minor style fix 2018-12-14 16:48:13 +01:00
Torkel Ödegaard beff16bc8d updated snapshot 2018-12-14 16:38:52 +01:00
Torkel Ödegaard 677eb6d179 fixes to unit picker 2018-12-14 16:27:48 +01:00
Peter Holmberg 7c83d7ba82 updates on thresholds component 2018-12-14 16:27:42 +01:00
Jeremy Jones 8d8ef8f97f remove check on axis.used in flot #13765 2018-12-14 09:04:47 -06:00
Torkel Ödegaard 84df0e2dde Added custom scrollbar to select component 2018-12-14 15:25:49 +01:00
ijin08 3c059bc9d6 removed a test that isn't neccessery any more 2018-12-14 14:50:46 +01:00
ijin08 3215f8abfe replaced content in addpanelpanel with three buttons that can create new panel, paste copied panel, and add a new row, to paste panel one must copy one first, code is still quite rough 2018-12-14 14:33:49 +01:00
Torkel Ödegaard 9e4547f787 fixed cloudwatch issue 2018-12-14 14:25:35 +01:00
Torkel Ödegaard cb7ffb4415 select refactor fixes 2018-12-14 14:19:39 +01:00
Peter Holmberg f8c8f2ec2c gauge working without thresholds 2018-12-14 14:18:18 +01:00
Daniel Lee 3581d619f3 Merge pull request #14499 from grafana/14483/copy-invite-link-fix
Fix for copy invite link
2018-12-14 14:17:36 +01:00
Peter Holmberg a7548cd294 Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-14 14:08:53 +01:00
Peter Holmberg 5f4eaad8a7 changin colors 2018-12-14 14:08:29 +01:00
Torkel Ödegaard ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Peter Holmberg d37dae34f2 fixing issue with copy invite link 2018-12-14 13:49:14 +01:00
Peter Holmberg 3662f1c007 getting closer with no thresholds 2018-12-14 13:23:22 +01:00
Torkel Ödegaard 24825dc899 renamed folder to select 2018-12-14 12:59:45 +01:00
Torkel Ödegaard ab31d52b77 Merge branch 'panel-edit-style-changes' into select-refactor 2018-12-14 12:39:35 +01:00
Torkel Ödegaard 58cc2e34d6 User picker using common select componnet 2018-12-14 12:38:36 +01:00
Torkel Ödegaard b9a05a8543 Merge pull request #14494 from grafana/panel-edit-style-changes
Panel edit style changes
2018-12-14 12:27:45 +01:00
Torkel Ödegaard 104292df63 wip: unifying select components 2018-12-14 11:23:05 +01:00
Torkel Ödegaard e40d21459a fixing input unit test failure 2018-12-14 11:03:42 +01:00
Torkel Ödegaard 42ee81a97c fixed issue with switching panels 2018-12-14 10:47:18 +01:00
Torkel Ödegaard 0823712c9a refactored panel-option-section into react component 2018-12-14 09:44:48 +01:00
Pavel 0fe9bfbc3c Merge pull request #3 from grafana/master
Merge master
2018-12-14 09:54:08 +02:00
Torkel Ödegaard ec035d6847 removed console log 2018-12-13 21:35:15 +01:00
Torkel Ödegaard 9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Peter Holmberg 234095e6df starting with threshold refactor 2018-12-13 16:46:10 +01:00
Erik Sundell 146aa7abab wip: convert angular directives to react components 2018-12-13 16:40:14 +01:00
Torkel Ödegaard dc22beadca wip: style change progress 2018-12-13 16:02:14 +01:00
Carl Bergquist 82adf5393e Merge pull request #14482 from joesis/logging-provisioning-file-reader
log error when resolvePath
2018-12-13 15:16:15 +01:00
Torkel Ödegaard 3517029ede Update CHANGELOG.md 2018-12-13 14:34:30 +01:00
Torkel Ödegaard 8a6ed4814c Update latest.json 2018-12-13 14:31:05 +01:00
Torkel Ödegaard 3f1adf1390 wip: styles are starting to come together 2018-12-13 14:28:44 +01:00
Torkel Ödegaard 889518e8e1 wip: styles 2018-12-13 13:27:33 +01:00
Torkel Ödegaard fe0f66b3f2 wip: testing new styles 2018-12-13 13:14:39 +01:00
Torkel Ödegaard 5fde977185 wip: style changes 2018-12-13 13:05:43 +01:00
Torkel Ödegaard 226e55b188 fixed ordering changing panel types, fixes issues with loading panel options 2018-12-13 11:35:07 +01:00
Peter Holmberg c78d5fb24e Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-13 11:19:16 +01:00
Peter Holmberg 8615de8119 moving min/max to gauge options 2018-12-13 11:16:31 +01:00
Joesis 92a8c5b81b log error when resolvePath 2018-12-13 02:10:29 -08:00
Torkel Ödegaard 1d325cf66f Merge pull request #14423 from grafana/14378-develop-table-options-ux
Removed side menu for column styles
2018-12-13 09:12:05 +01:00
Torkel Ödegaard a9e98feea0 Merge pull request #14476 from grafana/metrics-tab-changes-2
Metrics tab changes 2
2018-12-13 09:11:14 +01:00
Torkel Ödegaard 8994f3c283 Merge pull request #14461 from grafana/gauge-value-mappings
Gauge value mappings
2018-12-13 09:11:01 +01:00
Torkel Ödegaard 633ae8c37a Merge pull request #14457 from grafana/fix/new-datasource-check-lowercase
Check with lowercase
2018-12-13 09:09:56 +01:00
Torkel Ödegaard 77963e68b5 Merge pull request #14472 from grafana/loki-db-mig
migration: renames logging ds to loki ds in data_source table
2018-12-13 09:05:18 +01:00
Torkel Ödegaard f39fd7655e wip: minor style changes 2018-12-13 08:56:20 +01:00
Torkel Ödegaard 666e8e8330 wip: changes 2018-12-13 07:44:58 +01:00
Erik Sundell ad55be9865 break out metric picker and filter 2018-12-13 00:16:48 +01:00
Daniel Lee 90e2175716 migration: renames logging ds to loki ds in data_source table 2018-12-12 20:54:05 +01:00
Daniel Lee 8e00bb340c Merge pull request #14471 from grafana/loki-image
loki: updates the logo
2018-12-12 20:45:22 +01:00
Daniel Lee 2d2254293b loki: updates the logo 2018-12-12 20:34:33 +01:00
Peter Holmberg 1f533ddfe2 fixing tests 2018-12-12 16:20:47 +01:00
Peter Holmberg dbba523d3b mixing color when 2018-12-12 16:16:05 +01:00
Torkel Ödegaard e08e38bd88 Merge pull request #14460 from grafana/14435_fix
Add oauth_auto_login setting to defaults file
2018-12-12 14:51:51 +01:00
Torkel Ödegaard 1751a51088 wip 2018-12-12 14:44:40 +01:00
Torkel Ödegaard 5adb0f79df wip 2018-12-12 14:25:07 +01:00
Erik Sundell 7cc42d7c13 remove on metric type change 2018-12-12 14:08:47 +01:00
Torkel Ödegaard be7e7fcb40 things are working 2018-12-12 13:59:19 +01:00
Erik Sundell f6109d21d2 fix remove filter bug 2018-12-12 13:59:13 +01:00
Erik Sundell d154d16061 use same color for label as in explore dropdown 2018-12-12 13:58:25 +01:00
Erik Sundell ac416ba880 cleanup query filter 2018-12-12 13:57:32 +01:00
Marcus Efraimsson fada00f87e changelog: add notes about closing #8843 #11175 2018-12-12 13:27:25 +01:00
Marcus Efraimsson c46d01dc83 Merge pull request #14090 from marefr/8843_pipeline_doc_count
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Torkel Ödegaard 9f0d7314dd fixed unit tests 2018-12-12 13:05:24 +01:00
Erik Sundell ad9a35198d update failing tests 2018-12-12 12:57:57 +01:00
Erik Sundell bcb218f57c remove redundant default value 2018-12-12 12:55:23 +01:00
Torkel Ödegaard b6a5375af1 wip 2018-12-12 12:51:39 +01:00
Torkel Ödegaard 21e1d7b05b wip 2018-12-12 11:24:18 +01:00
Peter Holmberg 80a2c3b151 redone state 2018-12-12 11:23:33 +01:00
Peter Holmberg 50cd8d995b display value map or range map 2018-12-12 11:04:34 +01:00
Marcus Efraimsson b9e91cab0e add oauth_auto_login setting to defaults file
Making the setting configurable thru environment variable
2018-12-12 10:42:37 +01:00
Erik Sundell ae922747db use new option group in aggregation directive 2018-12-12 09:57:30 +01:00
Torkel Ödegaard 7161b2dc9b wip 2018-12-12 09:51:17 +01:00
Erik Sundell 33146b248e remove redundant default value 2018-12-12 09:14:06 +01:00
Torkel Ödegaard 8497c854f6 Adding mixed query 2018-12-12 08:54:12 +01:00
Peter Holmberg 29bcdef104 Check with lowercase 2018-12-12 08:47:08 +01:00
Torkel Ödegaard 87e6f86f87 wip metrics tab changes 2018-12-12 08:33:49 +01:00
bergquist ed2a9b8e73 changelog: adds note about closing #13754 2018-12-12 08:08:30 +01:00
Torkel Ödegaard 3452ee5a9c wip: making things work again 2018-12-12 06:52:08 +01:00
Torkel Ödegaard fa4fddf7b5 React-select refactorings 2018-12-11 22:17:32 +01:00
Erik Sundell ab5e5de814 wip: add option group component 2018-12-11 20:12:33 +01:00
Erik Sundell b18f064817 wip: add basic option header 2018-12-11 20:11:18 +01:00
Torkel Ödegaard 1d7d72b49d wip: react select css refactoring 2018-12-11 18:49:48 +01:00
Daniel Lee ee275cf2dc Merge pull request #14453 from grafana/readme-explore-link-fix
docs: fix broken link on explore page
2018-12-11 17:26:51 +01:00
Daniel Lee 46565efc04 docs: fix broken link on explore page 2018-12-11 17:17:01 +01:00
Torkel Ödegaard d998527128 wip 2018-12-11 17:03:38 +01:00
Daniel Lee d7ba9c1a54 Merge pull request #14325 from grafana/docs-explore
WIP docs for the new Explore feature
2018-12-11 16:45:35 +01:00
Torkel Ödegaard 45fde57ef9 Merge branch 'develop' into metrics-tab-changes 2018-12-11 16:45:04 +01:00
Torkel Ödegaard b0c014bf24 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 16:44:52 +01:00
Peter Holmberg f7cb5a1fd5 changing type and started on Gauge 2018-12-11 16:44:42 +01:00
Torkel Ödegaard 4dbfcde782 Merge pull request #14446 from grafana/14274-develop-viz-keynav
Change KeyboardNavigation HOC to a component with render prop instead
2018-12-11 16:44:30 +01:00
Peter Holmberg 0ba75a88a5 fix threshold test 2018-12-11 16:06:36 +01:00
Peter Holmberg 5f7bc13678 Adding label 2018-12-11 15:58:48 +01:00
Peter Holmberg 6ab93982ae styling on dropdowns 2018-12-11 15:47:30 +01:00
Torkel Ödegaard 076a1be03a Merge pull request #14449 from grafana/14437-tag-filter
Filter tags select box on text input #14437
2018-12-11 15:21:51 +01:00
Peter Holmberg c2b1f504a0 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-11 15:19:28 +01:00
Peter Holmberg 346f5f2595 Using drop down instead 2018-12-11 15:14:53 +01:00
Johannes Schill 6bb9415b0e Filter tags select box on text input #14437 2018-12-11 15:04:40 +01:00
Peter Holmberg db87c5126b fixed id bug 2018-12-11 14:45:18 +01:00
Peter Holmberg ddf080dab6 Using an id to identify mappings 2018-12-11 14:17:58 +01:00
Johannes Schill a0da303f80 Change KeyboardNavigation from hoc to render prop component 2018-12-11 13:50:01 +01:00
Johannes Schill 07ce88f685 Clean up hoc and extend component props automatically 2018-12-11 13:50:01 +01:00
Johannes Schill 645812f643 Let VizTypePicker use the keyboard navigation hoc 2018-12-11 13:50:01 +01:00
Torkel Ödegaard 4591c3555c Moved more metrics tab to react 2018-12-11 13:36:44 +01:00
Erik Sundell 847f5491bf Wrap react select component in angular directive 2018-12-11 13:14:55 +01:00
Torkel Ödegaard d6c6ba642e Don't show heading for first tab 2018-12-11 10:33:09 +01:00
Torkel Ödegaard 5d4034be5a Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 10:13:57 +01:00
Torkel Ödegaard f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Torkel Ödegaard 71bf5ca8c6 Merge pull request #14429 from grafana/docker-blocks-links
Docker blocks: Use links instead of bridge network
2018-12-11 09:14:54 +01:00
Torkel Ödegaard 75a1536c91 Merge pull request #14434 from grafana/14274-reset-search
14274 develop - Reset DsPicker and VizPicker state when closed
2018-12-11 09:14:41 +01:00
Torkel Ödegaard 479869085c Merge pull request #14433 from grafana/14274-develop-viz-keynav
14274 develop - VizPicker keyboard navigation
2018-12-11 09:14:26 +01:00
Torkel Ödegaard 0253792dad Merge pull request #14438 from grafana/davkal/explore-enhanced-log-parsing
Explore: Improved line parsing for logging
2018-12-11 09:10:45 +01:00
ryan 7d6c1dd825 Merge remote-tracking branch 'grafana/master'
* grafana/master: (93 commits)
  updated publish script
  Update CHANGELOG.md
  fix time regions bugs
  fixed issue with colorpicker position above window, fixes #14412
  fixed issue with singlestat and repeated scopedVars, was only working for time series data sources, and only if there was any series, now scoped vars is always set, fixes #14367
  fix search tag issues, fixes #14391
  Clear query models when changing data source type, fixes #14394
  Use correct variable name in fail text
  Fix logs panel meta wrap
  Explore: dont pass all rows to all rows, fixes profiler
  Explore: Logging dedup tooltips
  Explore: Hide scanning again after result was found
  Explore: Fix timepicker inputs for absolute dates
  Switch to global match for full browser support of escaped custom vars
  Allow backslash escaping in custom variables
  Fixed issue with logs graph and stacking
  align yellow collor with graph in logs table
  Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate.  Pull request #14399
  allow sidemenu sections without children still have a hover menu/header
  changelog: adds note about closing #11221
  ...
2018-12-10 16:52:19 -08:00
Victor Cinaglia 411d67cae7 snapshots: Add support for deleting external snapshots 2018-12-10 18:47:23 -05:00
Daniel Lee a2f4775b8d docs: explore
Documentation for the new Explore feature.

Describes both the Prometheus-specific features and the
Loki (logging) features.
2018-12-10 23:51:14 +01:00
Victor Cinaglia 9d6da10e82 snapshots: Move external snapshot creation to backend 2018-12-10 16:36:32 -05:00
Victor Cinaglia d9d6a4481f snapshots: Add external_delete_url column 2018-12-10 16:25:02 -05:00
Johannes Schill 20134c902b Add keyboard navigation to datasource picker via a hoc. 2018-12-10 21:42:53 +01:00
Johannes Schill 1ffac5a33d Use react's onKeyDown event on the input instead of event listener on document 2018-12-10 21:38:07 +01:00
David Kaltschmidt 71429d7210 Explore: Improved line parsing for logging
- changed log parser API to be more semantic: getting fields, getting values
- regexps become an implementation detail of parser and are no longer part of the API
- improved JSON parser to not be tripped by nested quotation marks
- improved JSON parser to support numbers
- added more tests
2018-12-10 10:05:57 -08:00
Peter Holmberg 76f296e299 fixed typings and remove 2018-12-10 16:57:34 +01:00
Torkel Ödegaard b380f74131 updated publish script 2018-12-10 16:39:54 +01:00
Johannes Schill 6ac8f5c7a5 Unmount component when fading out to reset its state, such as search.. 2018-12-10 15:51:41 +01:00
Torkel Ödegaard 6c3f9effd4 Update CHANGELOG.md 2018-12-10 15:40:43 +01:00
Johannes Schill cdcc316310 Variable rename. Did not make sense at all. 2018-12-10 15:29:51 +01:00
Johannes Schill 856c0ee052 Fix styling for vizPicker keyboard nav and change so only arrow up/down is OK to use 2018-12-10 15:20:32 +01:00
Peter Holmberg 4a57d594e5 fixed styling 2018-12-10 14:50:32 +01:00
Johannes Schill ae5bc366c2 Start adding keyboard navigation to VizPicker 2018-12-10 14:45:49 +01:00
Torkel Ödegaard a0fc013472 Merge pull request #14428 from grafana/14425_time_regions
Fix time regions bugs
2018-12-10 14:40:48 +01:00
Torkel Ödegaard 512b617120 Merge pull request #14427 from grafana/color-picker-position-fix
Fixed issue with colorpicker position above window
2018-12-10 14:39:26 +01:00
Erik Sundell 49e756aa93 use links instead of bridge network 2018-12-10 14:25:29 +01:00
Marcus Efraimsson 8f26fe0fbb fix time regions bugs 2018-12-10 14:25:03 +01:00
Torkel Ödegaard aea74f0e7f Merge pull request #14426 from grafana/fix-singlestat-repeat-variable-issue
fixed issue with singlestat and repeated scopedVars
2018-12-10 14:17:23 +01:00
Torkel Ödegaard 6f061ab159 Merge pull request #14403 from grafana/logs-graph-stacking
Fixed issue with logs graph and stacking
2018-12-10 14:16:28 +01:00
Torkel Ödegaard 0c5fd21327 fixed issue with colorpicker position above window, fixes #14412 2018-12-10 14:07:20 +01:00
Torkel Ödegaard 976d25d6ae fixed issue with singlestat and repeated scopedVars, was only working for time series data sources, and only if there was any series, now scoped vars is always set, fixes #14367 2018-12-10 13:40:32 +01:00
Torkel Ödegaard 6433ff4bdc Merge pull request #14424 from grafana/fix-search-tag-issues
Fix search tag UI issues
2018-12-10 13:39:04 +01:00
Torkel Ödegaard e05f6c5397 fix search tag issues, fixes #14391 2018-12-10 13:23:38 +01:00
Torkel Ödegaard acf24bd679 Clear query models when changing data source type, fixes #14394 2018-12-10 12:56:49 +01:00
Torkel Ödegaard 74b3a509f7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-10 12:32:37 +01:00
Torkel Ödegaard 514c8a0210 fixed issue with grid responsive mode 2018-12-10 12:20:14 +01:00
Torkel Ödegaard 336fb4180f Merge pull request #14285 from grafana/14280_fix_time_region
Fix time regions using zero hours
2018-12-10 12:12:19 +01:00
Torkel Ödegaard 7e0bc8f30d fixed max height issue not being respected by react select dropdown 2018-12-10 12:02:27 +01:00
ijin08 ee55a9c18b removed side menu for column styles, added small header to column styles with a border 2018-12-10 11:59:02 +01:00
Carl Bergquist 1b6ed5815e Merge pull request #14405 from IntegersOfK/master
Allow backslash escaping in custom variables
2018-12-10 07:40:18 +01:00
Carl Bergquist e61d87704d Merge pull request #14417 from Napsty/fix-variable-name-in-rp-warning
Use correct variable name in fail text
2018-12-10 07:13:59 +01:00
Claudio Kuenzler 1dc3728f6a Use correct variable name in fail text 2018-12-10 06:54:12 +01:00
David Kaltschmidt 117adbbe5d Fix search field styles 2018-12-09 14:39:25 -08:00
David Kaltschmidt 9293ff06cd Enable search also after editing 2018-12-09 18:53:03 +01:00
David Kaltschmidt 6b9200a606 Explore: Split logging query into selector and search
- add second query field to logging datasource query component
- second field manages search term, first field manages stream selectors
- improved logging cheat sheet to get started
2018-12-09 18:44:59 +01:00
Torkel Ödegaard 1f7fece802 Merge pull request #14413 from grafana/davkal/fix-logging-meta-wrapping
Fix logs panel meta wrap
2018-12-09 18:44:47 +01:00
Torkel Ödegaard a9fc77b411 Merge pull request #14408 from grafana/davkal/fix-14407
Explore: Hide scanning again after result was found
2018-12-09 17:46:14 +01:00
Torkel Ödegaard 837a621502 Merge pull request #14410 from grafana/davkal/explore-logging-dedup-description
Explore: Logging dedup tooltips
2018-12-09 17:44:45 +01:00
Torkel Ödegaard c58f818ea2 Merge pull request #14411 from grafana/davkal/fix-14362
Explore: dont pass all rows to all rows, fixes profiler
2018-12-09 17:42:47 +01:00
David Kaltschmidt b0c431ae67 Fix logs panel meta wrap 2018-12-09 17:22:35 +01:00
David Kaltschmidt 61924e9130 Explore: dont pass all rows to all rows, fixes profiler
- react profiler seems to evaluate all props of all components down the tree
- this becomes slow when 1000 rows are passed to 1000 rows and their labels
- use getter function instead to ask for rows on demand
2018-12-09 13:23:44 +01:00
David Kaltschmidt 487de2b832 Explore: Logging dedup tooltips
- use title attribute of toggle button group
- add descriptions for all dedup options
2018-12-09 13:06:34 +01:00
David e5c547c504 Merge pull request #14406 from grafana/davkal/fix-14390
Explore: Fix timepicker inputs for absolute dates
2018-12-09 11:45:17 +01:00
David Kaltschmidt 1bcc866341 Explore: Hide scanning again after result was found
- when query result was found, stop scanning
- this hides the scan status again
2018-12-09 11:42:35 +01:00
Torkel Ödegaard 6dc050d01e Merge pull request #14401 from evergage/14399-cloudwatch-bouncerate
Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate.  …
2018-12-09 11:06:01 +01:00
David Kaltschmidt 60ee4499e7 Explore: Fix timepicker inputs for absolute dates
- Timepicker needs to keep from and to internally as strings
for the fully controlled inputs
- make sure from and to are strings when time is reset
2018-12-09 07:05:27 +01:00
AJ West 6c95acc837 Switch to global match for full browser support of escaped custom vars 2018-12-08 18:23:08 -05:00
AJ West 2b3d366f7c Allow backslash escaping in custom variables 2018-12-08 17:31:05 -05:00
Torkel Ödegaard 14cf846e73 Fixed issue with logs graph and stacking 2018-12-08 11:15:02 -08:00
Torkel Ödegaard 683b718e2b align yellow collor with graph in logs table 2018-12-08 09:45:02 -08:00
Torkel Ödegaard a3dd29fb66 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-08 13:03:58 +01:00
Torkel Ödegaard 912dc0f2a9 Merge pull request #14392 from grafana/14377-develop-graph-options
Removed graph side menu
2018-12-08 13:03:42 +01:00
Torkel Ödegaard 1bb535bbe3 minor style change 2018-12-08 12:54:36 +01:00
Scott Glajch 62a5cd27ba Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399 2018-12-07 16:42:29 -05:00
Torkel Ödegaard 3d0c54a946 logs style polish 2018-12-07 12:13:23 -08:00
Torkel Ödegaard efede26eea Merge pull request #14382 from grafana/davkal/remove-explore-tab
Remove Explore > "New tab" from sidebar
2018-12-07 20:24:13 +01:00
Torkel Ödegaard 30c2cc4b5c allow sidemenu sections without children still have a hover menu/header 2018-12-07 11:14:32 -08:00
Torkel Ödegaard cb59f388ca explore logs options styling 2018-12-07 17:23:35 +01:00
Torkel Ödegaard bfbb44af03 transparent toggle style and new button group style 2018-12-07 17:15:46 +01:00
Peter Holmberg a0a06911d8 Toggle buttons 2018-12-07 17:08:28 +01:00
Peter Holmberg 368f1f67e4 render a value mapping row 2018-12-07 16:55:58 +01:00
ijin08 bd589b61bd removed side menu from display options, kept overrides in display options, moved thresholds and time regions to its own section in visualization 2018-12-07 15:18:43 +01:00
Peter Holmberg 4f39df900c Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:10:32 +01:00
Torkel Ödegaard 79933299c7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-07 15:09:09 +01:00
Peter Holmberg d474fd1b58 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:08:24 +01:00
Torkel Ödegaard eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
bergquist 2b5b16f5d3 changelog: adds note about closing #11221 2018-12-07 14:50:41 +01:00
Carl Bergquist 93dee6d4c2 Merge pull request #11410 from PatrickSchuster/add_google_hangouts_chat_notifier
Add Google Hangouts Chat notifier.
2018-12-07 14:49:28 +01:00
bergquist 9eea585773 removes unused code 2018-12-07 14:39:44 +01:00
bergquist 5d720674e3 Merge branch 'master' into add_google_hangouts_chat_notifier
* master: (322 commits)
  graphInterval needs to update after query execution, fixes #14364
  Explore: Parse initial dates
  Aligned styling of stats popover/box with rest of grafana & minor css refactoring
  Prometheus: Make result transformer more robust for empty responses
  Rebase fixes
  Explore: Logging line parsing and field stats
  fixed unit tests
  made unknown color theme aware and sync with graph color, some minor cleanup
  Explore: improve error handling
  use render props instead of cloneElement
  sort of a hacky way to figure if the small variation should be used for the label
  add basic button group component, using the the same label style as is
  explore logs styling
  wip: alternative level styling & hover effect
  wip: explore logs styling
  more detailed error message for loki
  If user login equals user email, only show the email once #14341
  UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons.  #14341
  wip: explore logs styling
  restoring monospace & making sure width are correct when hiding columns
  ...
2018-12-07 14:31:13 +01:00
bergquist a90bba859a fixes merge error 2018-12-07 14:17:09 +01:00
Erik Sundell 569f5e8d5e remove result format. might add this later 2018-12-07 14:13:05 +01:00
Erik Sundell 68c2d2631e filter out build in datasources. add unit test 2018-12-07 14:11:40 +01:00
Daniel Lee 687cf013bd Merge pull request #14385 from grafana/davkal/fix-explore-date-parsing
Explore: Parse initial dates
2018-12-07 14:10:36 +01:00
Erik Sundell b1a40992d3 Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-07 13:58:07 +01:00
Torkel Ödegaard 5d22cdab28 click on dashboard title moves you back to dashboard instead of search 2018-12-07 13:50:50 +01:00
Torkel Ödegaard 619b4b4872 Merge pull request #14336 from grafana/davkal/explore-line-parsing
Explore: Logging line parsing and field stats
2018-12-07 13:24:43 +01:00
Torkel Ödegaard a89e21c561 Merge pull request #14386 from grafana/explore-fix-interval-update
Explore: graphInterval needs to update after query execution
2018-12-07 13:21:43 +01:00
Torkel Ödegaard ef08b9cd2b graphInterval needs to update after query execution, fixes #14364 2018-12-07 13:07:08 +01:00
David Kaltschmidt a990b69baa Explore: Parse initial dates
- parse dates passed from URL
- keep everything local time for now
2018-12-07 12:41:47 +01:00
Daniel Lee 140205a783 Merge pull request #14381 from grafana/davkal/fix-prometheus-transformation-error
Prometheus: Make result transformer more robust for empty responses
2018-12-07 12:22:45 +01:00
Torkel Ödegaard 7cb456ea23 Aligned styling of stats popover/box with rest of grafana & minor css refactoring 2018-12-07 11:28:22 +01:00
David Kaltschmidt 80d62013b2 Remove Explore > "New tab" from sidebar
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +01:00
Erik Sundell 45fbbe8021 initialize empty variables array in constructor so that datasources can use the array in explore 2018-12-07 11:27:11 +01:00
David Kaltschmidt c0c06e4dd8 Prometheus: Make result transformer more robust for empty responses
- some prometheus-compatible backends may return `null` instead of empty lists
- test for lists before iterating
- added tests for empty responses
2018-12-07 11:22:55 +01:00
Torkel Ödegaard b8b468f733 Merge pull request #14343 from grafana/develop-14333
Update react panel header when changing angular panel settings
2018-12-07 10:54:00 +01:00
Torkel Ödegaard dbb34020ca Merge pull request #14375 from moznion/fix_quota_updating
Fix quota updating
2018-12-07 10:38:32 +01:00
Erik Sundell 260d0189b6 add table support flag in influx config 2018-12-07 10:29:38 +01:00
Erik Sundell 97180d5106 add scoped vars to query options 2018-12-07 10:28:51 +01:00
David Kaltschmidt fb4925a8c2 Rebase fixes 2018-12-07 10:22:52 +01:00
David Kaltschmidt acd52e6a93 Explore: Logging line parsing and field stats
Lazily parse lines and display stats for field when clicked on.

- log line parsers for JSON (basic), and logfmt
- delayed parsing in case user moves to other line
- reuse label stats for field stats
2018-12-07 09:59:55 +01:00
Torkel Ödegaard 9cc4e05205 Merge pull request #14366 from grafana/14341-wide-picker-no-button
Pickers with min-width instead of width
2018-12-07 09:05:22 +01:00
Torkel Ödegaard ef77748a1b Merge pull request #14368 from grafana/explore-logs-styling-alt2
Explore logs styling
2018-12-06 22:30:06 +01:00
Torkel Ödegaard e7fe0bd668 fixed unit tests 2018-12-06 12:29:55 -08:00
David be2d9edd1f Merge pull request #14353 from grafana/14249-multi-button-group
Multi button group
2018-12-06 21:27:34 +01:00
Torkel Ödegaard 9ac3821454 made unknown color theme aware and sync with graph color, some minor cleanup 2018-12-06 11:55:01 -08:00
Torkel Ödegaard 9c9d6c15e0 Merge branch 'master' into explore-logs-styling-alt2 2018-12-06 11:32:11 -08:00
Torkel Ödegaard 940dda6c30 Merge pull request #14369 from grafana/davkal/explore-error-handling
Explore: improve error handling
2018-12-06 20:26:47 +01:00
Marcus Efraimsson 093c9425e9 Merge pull request #14313 from dhenneke/postgres-use-table-not-schema-constraint
Improve PostgreSQL Query Editor if using different Schemas
2018-12-06 17:21:48 +01:00
Carl Bergquist 985576b482 Merge pull request #14365 from bergquist/loki_error_message
more detailed error message for loki
2018-12-06 17:17:19 +01:00
Peter Holmberg 6fff8e4a1c initial stuff 2018-12-06 17:09:32 +01:00
David Kaltschmidt 15eb3bb2f8 Explore: improve error handling 2018-12-06 16:47:36 +01:00
Erik Sundell b74c099773 use render props instead of cloneElement 2018-12-06 16:38:50 +01:00
Erik Sundell 6f8293af4e sort of a hacky way to figure if the small variation should be used for the label
improve light theme look

use new toggle button group in logs

stop propagation on click event

clean up styles

improve support for small when a label is present

refactoring - move toggle button to the group file. turn it into a stateless component

improve support for light theme

rename dedupe to dedup

use radius variable
2018-12-06 16:37:23 +01:00
Erik Sundell 0d7b09b0f6 add basic button group component, using the the same label style as is
remove not used code

cleanup
2018-12-06 16:37:09 +01:00
Johannes Schill fadabd997a Restore PluginEditCtrl accidently removed 2018-12-06 16:06:47 +01:00
Torkel Ödegaard 9a06fad24d Merge pull request #14352 from grafana/explore-logs-css-refactor
Explore logs css refactor
2018-12-06 15:52:25 +01:00
Torkel Ödegaard 5ac3b5a561 explore logs styling 2018-12-06 15:51:42 +01:00
Torkel Ödegaard 03b5f32e07 wip: alternative level styling & hover effect 2018-12-06 15:13:00 +01:00
Torkel Ödegaard b9517d1104 wip: explore logs styling 2018-12-06 14:03:57 +01:00
bergquist e230827c06 more detailed error message for loki
if grafana tries to access loki without promtail running
it will return an error.
2018-12-06 13:59:19 +01:00
Johannes Schill 02b14d33a6 If user login equals user email, only show the email once #14341 2018-12-06 13:46:04 +01:00
Johannes Schill 114a264da4 UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341 2018-12-06 13:46:04 +01:00
Torkel Ödegaard 25b5520345 Merge pull request #14361 from grafana/explore-logs-bucket-increase
fixed logs to time series calculation issue, increased bucket size
2018-12-06 13:31:59 +01:00
Torkel Ödegaard 86bb36fe97 wip: explore logs styling 2018-12-06 13:30:48 +01:00
Torkel Ödegaard 665ac229b6 restoring monospace & making sure width are correct when hiding columns 2018-12-06 12:49:28 +01:00
Torkel Ödegaard 2e6690428f fixed logs to time series calculation issue, increased bucket size, fixes #14248 2018-12-06 12:12:43 +01:00
Johannes Schill 8460b48c24 Always open panel links in new window if user asked for it #14333 2018-12-06 11:19:41 +01:00
Johannes Schill 276f2567ee Changing from PureComponent to Component to re-render on link updates made in Angular #14333 2018-12-06 10:54:31 +01:00
Torkel Ödegaard e884cf6250 minor tweaks, now table renders faster and changes less on second stage rendering 2018-12-06 10:53:01 +01:00
Torkel Ödegaard afd7580598 explore logs css refactoring, step1 2018-12-06 10:53:01 +01:00
Torkel Ödegaard c7d701c8fa explore logs styling poc, WIP 2018-12-06 10:53:01 +01:00
Daniel Lee 8bac55ca70 Merge pull request #14350 from grafana/rename-logging-ds
Rename Grafana Logging Datasource to Loki
2018-12-06 10:34:30 +01:00
Johannes Schill d62cd8a5c5 Fix transparent option #14333 2018-12-06 10:34:27 +01:00
Johannes Schill a516ff81c9 Add prop key to panelPropsString to avoid a bug when changing another value and the render doesnt trigger 2018-12-06 09:39:17 +01:00
Daniel Lee 40898e1cd6 loki: adds proper error handling for config page
This handles three different error cases for the
config page so that the user gets an error and not
just a blank red error box.
2018-12-06 00:42:31 +01:00
Daniel Lee 721e1d7555 renames Grafana Logging ds to Loki 2018-12-06 00:42:31 +01:00
Torkel Ödegaard 8fa7a71d32 Merge pull request #14340 from grafana/datasource-settings-isdefault
Datasource settings isdefault
2018-12-05 20:37:44 +01:00
Johannes Schill 827ffaccd3 Pass some panel props down as strings to trigger render #14333 2018-12-05 14:57:57 +01:00
Johannes Schill ed034b4288 Trigger panel.render on title, description, links change #14333 2018-12-05 14:56:29 +01:00
moznion 4397ee61d0 Put issue number to test code 2018-12-05 22:47:41 +09:00
moznion d1e1cde00e Fix bug what updating user quota doesn't work
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion 061e06c226 Fix bug what updating org quota doesn't work
https://github.com/grafana/grafana/blob/3c330c8e4c0b0f9fb258801ba8a7fe2586bbc819/pkg/services/sqlstore/quota.go#L106

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.
2018-12-05 22:19:40 +09:00
Torkel Ödegaard 128168ec92 Merge pull request #14328 from grafana/gauge-icon
add icon
2018-12-05 13:36:17 +01:00
Torkel Ödegaard 09380399ef Merge pull request #14331 from grafana/develop-tooltip-css
Portal component
2018-12-05 13:36:03 +01:00
Mario Trangoni 37bb8840f0 public/app/plugins/*: Fix some misspell issues 2018-12-05 13:13:29 +01:00
Mario Trangoni 400db64db5 public/sass/*: Fix misspell issue 2018-12-05 13:09:27 +01:00
Mario Trangoni ab9f65a4cf public/app/features/*: Fix some misspell issues 2018-12-05 13:08:00 +01:00
Mario Trangoni 0f74843332 public/app/core/*: Fix some misspell issues 2018-12-05 13:02:58 +01:00
Mario Trangoni b2ef857020 README.md: Fix small typo 2018-12-05 12:59:56 +01:00
Peter Holmberg 690e701f6d fix snapshots 2018-12-05 12:50:14 +01:00
Peter Holmberg 72b7497d66 Added isDefault switch on settings 2018-12-05 11:47:02 +01:00
Torkel Ödegaard e4e408676f Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-05 11:20:25 +01:00
Torkel Ödegaard e01c196d88 fix to switch component 2018-12-05 11:19:38 +01:00
Johannes Schill 7d6db12f34 Rename BodyPortal to Portal and accept prop "root" which is where the portal should be placed 2018-12-05 10:50:26 +01:00
Torkel Ödegaard aa6c52a1ba Merge pull request #14323 from grafana/develop-tooltip-css
Small tooltip css-adjustments and add css for position "bottom-start"…
2018-12-05 10:40:10 +01:00
Johannes Schill 1bbe48e9c5 Create a portal and use it with our popper component (tooltip and popover) to avoid potential overflow-/zindex-bugs 2018-12-05 10:38:53 +01:00
Carl Bergquist 3c330c8e4c Merge pull request #14317 from mjtrangoni/fix-misspell-issues
pkg/*: Fix misspelling issues using locale US
2018-12-05 10:34:28 +01:00
Peter Holmberg 2de984cbde add icon 2018-12-05 10:33:15 +01:00
Torkel Ödegaard 825b819270 Merge pull request #14316 from grafana/embedding-fix
fix for panel height when embedding
2018-12-05 10:32:48 +01:00
Torkel Ödegaard 311ec3c0af Merge pull request #14324 from grafana/panel-initialized-fix
fix for panel-initialized event not being called
2018-12-05 10:32:25 +01:00
Torkel Ödegaard 5f8001689b explore data source selector fix 2018-12-05 10:22:26 +01:00
Torkel Ödegaard 180ca021b5 Merge branch 'master' into develop 2018-12-05 10:17:22 +01:00
Johannes Schill 0a8f23d8a6 Update css to use the border-radius variable and add a new variable for the popper's distance to its ref 2018-12-05 09:39:03 +01:00
Torkel Ödegaard 769407cd34 Merge pull request #14314 from nitti/add_influxdb_cumulative_sum
added support for influxdb cumulative_sum function in tsdb
2018-12-05 09:29:04 +01:00
Torkel Ödegaard 735c28580d Update README.md 2018-12-05 09:26:01 +01:00
Torkel Ödegaard 1785e40e9d Merge pull request #14322 from grafana/develop-readme-fix
Readme: We should write Node.js the same way in all places in the readme
2018-12-05 09:24:50 +01:00
Torkel Ödegaard 757cada4a5 fix for panel-initialized event not being called 2018-12-05 09:23:47 +01:00
Torkel Ödegaard 0ad42641a2 Merge pull request #14303 from grafana/develop-keep-panel-settings
Develop keep panel settings when switching visualizations
2018-12-05 09:06:55 +01:00
Torkel Ödegaard 4872cef808 refactored and added tests for panel model remember properties 2018-12-05 07:33:21 +01:00
Torkel Ödegaard a6ef156922 Merge pull request #14320 from briangann/20181104_remove_trace_output_for_routes
redact value for plugin proxy routes
2018-12-05 06:52:32 +01:00
Brian Gann 02365514f9 redact value for plugin proxy routes 2018-12-04 22:35:00 -06:00
Mario Trangoni fadd816d89 pkg/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
Torkel Ödegaard e31490ac68 fix for panel embedding. Solo panel height was not correctly set. Made panel--solo into panel-solo class. in develop branch we have remove the need for the panel class 2018-12-04 12:36:43 -08:00
Torkel Ödegaard 6c46a1c8ea Merge pull request #13873 from grafana/davkal/babel-7
JS tooling: upgrade to babel 7
2018-12-04 21:16:35 +01:00
Tom Nitti 1e53c12921 added support for influxdb cumulative_sum function in tsdb 2018-12-04 12:46:50 -06:00
Dominik Henneke b450b778cb Use buildTableConstraint instead of buildSchemaConstraint to find the datatype of a column if using a table from a different database schema 2018-12-04 19:26:12 +01:00
Torkel Ödegaard 0c855fb974 Merge pull request #14308 from grafana/davkal/explore-dedup-number
Explore: Display duplicate row count as number
2018-12-04 17:57:09 +01:00
Johannes Schill 6d7374d982 Readme: We should write Node.js the same way in all places in the readme 2018-12-04 17:16:08 +01:00
Johannes Schill e55659192a Small tooltip css-adjustments and add css for position "bottom-start" used by the panel header corner 2018-12-04 17:00:00 +01:00
Johannes Schill c2aa64595a Merge pull request #14234 from grafana/gauge-value-options
Gauge value options
2018-12-04 16:30:34 +01:00
David Kaltschmidt 6980d2e142 Explore: Display duplicate row count as number
- the pips were hard to see
- make it really clear which rows are duplicates by allocating a column to show number
2018-12-04 16:21:27 +01:00
David c4a89eb32d Merge pull request #14277 from grafana/davkal/explore-logging-live-preview
Explore: Logging query live preview of matches
2018-12-04 16:20:01 +01:00
David Kaltschmidt b95b796a34 Adapt styles 2018-12-04 15:58:10 +01:00
David Kaltschmidt 6ee7459f22 Explore: Logging query live preview of matches
A logging query has a selector part and a regexp. The regexp matches are highlighted when results return.
This change adds live preview to matches when modifying the regexp in a search field.

- delegate retrieval of match query to datasource
- datasource returns search expressions to be used to highlight a live preview of matches
- logs row now takes preview highlights
- logs row renders preview highlights with dotted line to distinguish from query run matches (solid line)
- fix react-highlight-words version to ensure custom chunk matcher
- custom chunk matcher can now also take incomplete regexps, eg, `(level` without inifinte looping
- perf: debounce of live preview to 500ms
- perf: only top 100 rows get the live preview
- preview is only supported with one query row (multiple rows semantic makes this tricky: regexp for row n should only filter results for query n)
2018-12-04 15:47:51 +01:00
David 34b8c5bb61 Merge pull request #14278 from grafana/14272-scan-old-logs
only make it possible to scan for older logs if there is at least one…
2018-12-04 15:44:55 +01:00
Torkel Ödegaard 6cb639baaa Merge pull request #14283 from grafana/explore-styling-fixes
Misc styling fixes to explore
2018-12-04 15:17:10 +01:00
Torkel Ödegaard 33dd880e09 Merge pull request #14295 from grafana/develop-visualization-search
Add VizPicker search
2018-12-04 15:11:41 +01:00
Torkel Ödegaard 401b470ebb added max-widths to explore start pages boxes 2018-12-04 15:06:30 +01:00
Johannes Schill fe9e4b51f1 Alert tab fails when datasource method targetContainsTemplate doesnt exist #14274 2018-12-04 15:00:37 +01:00
Erik Sundell 27c4db06fc improve comments 2018-12-04 15:00:24 +01:00
Torkel Ödegaard 1fddb6144d fixed promql and loggging syntax so all punctuation chars are treated the same, remove hover move 2018-12-04 14:57:01 +01:00
Erik Sundell 9c8bd34787 remove all query empty related code. root cause of the problem was to fix hasNonEmptyQuery 2018-12-04 14:55:56 +01:00
Johannes Schill b8c6577626 Let the cached props from previous visualization be the masters, unless specified in keepLatestProps const 2018-12-04 14:39:56 +01:00
Johannes Schill 1ad4b44ec1 POC on how to save away settings from a viztype and restore when switching back to it #14274 2018-12-04 14:19:55 +01:00
Erik Sundell 8b3bb95007 remove redudant spread 2018-12-04 14:01:32 +01:00
Erik Sundell 4e591653bd Set query empty condition in render function. Also clear query transactions when no valid query is present 2018-12-04 13:26:26 +01:00
Erik Sundell 2af78aca8e Remove query empty from model 2018-12-04 13:23:26 +01:00
David 66c2854b11 Merge pull request #14275 from grafana/davkal/explore-logging-label-stats
Explore: Logging label stats
2018-12-04 13:02:29 +01:00
Torkel Ödegaard 47523f80dd fixed logging start page 2018-12-04 12:59:24 +01:00
Peter Holmberg f77c354341 Merge remote-tracking branch 'origin/develop' into gauge-value-options 2018-12-04 12:56:54 +01:00
Torkel Ödegaard ac6170a7cc Merge branch 'master' into explore-styling-fixes 2018-12-04 12:53:24 +01:00
David Kaltschmidt ffa584baec Use popover styles for stats popover 2018-12-04 12:50:29 +01:00
David Kaltschmidt a08042ea18 Fine tune stats styles 2018-12-04 12:41:32 +01:00
David Kaltschmidt 9f0b1e533f Tests for label stats calculation 2018-12-04 12:41:32 +01:00
David Kaltschmidt 5916cb3e7c Explore: Logging label stats
- added filter and stats icons to log stream labels
- removed click handler from label itself
- click on stats icon calculates label value distribution across loaded logs lines
- show stats in hover
- stats have indicator which value is the current one
- showing top 5 values for the given label
- if selected value is not among top 5, it is added
- summing up remaining label value distribution as Other
2018-12-04 12:41:32 +01:00
David a69ab2fb3a Merge pull request #14299 from grafana/14273-clear-scanning
Explore: Stop scanning when clear all button is clicked
2018-12-04 12:37:04 +01:00
David f73a479838 Merge pull request #14296 from grafana/davkal/explore-grid
Explore: return to grid layout for logs table
2018-12-04 12:34:58 +01:00
Erik Sundell f8cef73b5b stop scanning when clear all button is clicked 2018-12-04 11:28:04 +01:00
Leonard Gram 9a771555f3 build: update latest when pushing docker. 2018-12-04 11:16:49 +01:00
Erik Sundell 2be92af456 Use origin meta 2018-12-04 11:13:16 +01:00
Erik Sundell 541a691aca only display scan button if there is at least one existing selector that returned an empty result 2018-12-04 11:00:21 +01:00
Peter Holmberg 5e1005f66c minor refactoring 2018-12-04 10:50:40 +01:00
David Kaltschmidt 4ce79349a3 Explore: return to grid layout for logs table
- better column control than flexbox
- increased gutter and row spacing
2018-12-04 10:48:28 +01:00
Johannes Schill bc5a0d9120 Add VizPicker search #14274 2018-12-04 10:42:01 +01:00
Marcus Efraimsson 346e617a11 changelog: add notes about closing #11067 2018-12-04 10:24:38 +01:00
Marcus Efraimsson d507c73c12 Merge pull request #14265 from danielbh/feat/prevent-remove-last-admin
Fix prevent removing last grafana admin permissions
2018-12-04 01:20:44 -08:00
Torkel Ödegaard 1283a3292d fixed grabage in markup 2018-12-04 10:16:51 +01:00
Pavel bf55f36e95 Merge pull request #2 from grafana/master
Update master
2018-12-04 11:08:10 +02:00
Torkel Ödegaard 1828ace4b3 fix: align input backgrounds for code editors 2018-12-04 09:41:36 +01:00
Marcus Efraimsson 70eedc1fde Merge pull request #14294 from flopp999/patch-10
fixedUnit for Flow:l/min and mL/min
2018-12-04 00:36:27 -08:00
flopp999 8caeb13026 fixedUnit for Flow:l/min and mL/min
got stranged result with decimalSIPrefix
2018-12-04 08:03:25 +01:00
danielbh d1b8f13c66 feat: #11067 prevent removing last grafana admin permissions 2018-12-03 20:05:52 -05:00
Torkel Ödegaard 729d1d1da9 another style fix for broken dark theme word highlight 2018-12-03 11:55:30 -08:00
Marcus Efraimsson ad33cd5c5c fix time regions using zero hours 2018-12-03 18:06:37 +01:00
Torkel Ödegaard 44414c4346 Misc styling fixes to explore: start page, slate code editor colors, text highlight in auto completeter suggestion 2018-12-03 17:20:02 +01:00
Erik Sundell e21ca3f545 Revert commit 2018-12-03 17:17:57 +01:00
ryan b888aeec0d Merge remote-tracking branch 'grafana/master'
* grafana/master: (39 commits)
  update package.json to next version
  changelog: add notes about closing #13815
  changelog: add notes about closing #14246
  changelog: add notes about closing #12653
  Hid "Forgot your password" link from login menu when reset is disabled
  Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
  update changelog
  update latest.json to latest stable version
  new stable docs version
  dataproxy: Override incoming Authorization header
  changelog: add notes about closing #14228
  Explore: Show logging errors from backend
  change obj order when merging so that correct format is being used
  Explore: Fix logging query parser for regex with quantifiers
  Update README.md
  Fixed typo in function name
  Explore: Fix label and history suggestions
  let each sql datasource handle timeFrom and timeTo macros
  Review feedback
  changelog: add notes about closing #14167
  ...
2018-12-03 08:14:13 -08:00
Erik Sundell d9d84f45bc only make it possible to scan for older logs if there is at least one non failing selector 2018-12-03 16:58:46 +01:00
Marcus Efraimsson e9a8185da1 update package.json to next version 2018-12-03 16:49:32 +01:00
David Kaltschmidt d150b62d06 Stick to .tsx? for babel file test 2018-12-03 16:32:50 +01:00
Marcus Efraimsson 5641f45349 changelog: add notes about closing #13815 2018-12-03 15:52:16 +01:00
Marcus Efraimsson 95218c13ce Merge pull request #14262 from kornholi/fix/dataproxy-auth
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
Marcus Efraimsson b54061f4bd changelog: add notes about closing #14246 2018-12-03 15:04:48 +01:00
Peter Holmberg b6ef10b8db arrow function 2018-12-03 15:02:41 +01:00
Marcus Efraimsson ffec795fab Merge pull request #14232 from SilverFire/security-password-reset
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 06:02:29 -08:00
Marcus Efraimsson 4de28ef88a changelog: add notes about closing #12653 2018-12-03 14:47:02 +01:00
Marcus Efraimsson acb45867f8 Merge pull request #14179 from mattiarossi/master
Add support for offset in date histogram aggregation
2018-12-03 05:43:42 -08:00
Peter Holmberg 2f78f46afa fix for add/remove labels 2018-12-03 14:37:42 +01:00
SilverFire - Dmitry Naumenko 257802e750 Hid "Forgot your password" link from login menu when reset is disabled 2018-12-03 15:35:25 +02:00
SilverFire - Dmitry Naumenko 474197269e Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled 2018-12-03 15:32:26 +02:00
Peter Holmberg b4d5ddd6f4 fix for initial options 2018-12-03 13:33:17 +01:00
Torkel Ödegaard 9cbdd07315 Merge branch 'panel-edit-in-react-sidemenu' into develop 2018-12-03 13:21:07 +01:00
Torkel Ödegaard ab33cfd7c8 minor css fixes 2018-12-03 03:31:55 -08:00
Torkel Ödegaard d16b348868 Merge pull request #14257 from grafana/davkal/fix-14250
Explore: Fix logging query parser for regex with quantifiers
2018-12-03 12:25:10 +01:00
Marcus Efraimsson 246c1ca79d update changelog 2018-12-03 12:18:11 +01:00
Marcus Efraimsson 9c1c21eed2 update latest.json to latest stable version 2018-12-03 12:17:02 +01:00
Marcus Efraimsson 5c4b91c65e new stable docs version 2018-12-03 12:16:08 +01:00
Torkel Ödegaard bd89b4e6a5 Merge branch 'panel-edit-in-react' into develop 2018-12-03 02:58:51 -08:00
Torkel Ödegaard 9404d36ab5 Merge pull request #14135 from grafana/panel-edit-in-react
React Panel Editor Mode (For Angular and React Panels)
2018-12-03 11:50:06 +01:00
Torkel Ödegaard d38a0a0b64 Merge pull request #14106 from grafana/unit-picker
Unit picker
2018-12-03 10:53:48 +01:00
David ba18b470a4 Merge pull request #14260 from grafana/davkal/fix-14258
Explore: Show logging errors from backend
2018-12-03 10:00:22 +01:00
Torkel Ödegaard c99861a7b3 minor css fix 2018-12-03 00:46:45 -08:00
Peter Holmberg fd8fe35e29 redid props for gauge options 2018-12-03 09:37:45 +01:00
Carl Bergquist 3c8515bb77 Merge pull request #14220 from mjtrangoni/fix-misspell-issues
Fix misspelling issues using locale US
2018-12-03 09:18:46 +01:00
Kornelijus Survila 0cafd9a663 dataproxy: Override incoming Authorization header 2018-11-30 12:12:55 -07:00
David fab2597650 Merge pull request #14259 from grafana/14237-prevent-table-crash
change obj order when merging so that correct format is being used
2018-11-30 16:37:50 +01:00
Marcus Efraimsson 314152ebf6 changelog: add notes about closing #14228 2018-11-30 16:24:24 +01:00
Marcus Efraimsson 901ec01992 Merge pull request #14254 from grafana/14228_mysql_time_from_to
Fix mysql $__timeFrom() and $__timeTo() should respect local time zone
2018-11-30 07:22:34 -08:00
Marcus Efraimsson 1abbdaaaae Merge pull request #14241 from yukihiratype2/master
Update README.md
2018-11-30 07:19:46 -08:00
David c441b9eec3 Merge pull request #14256 from grafana/davkal/fix-14245
Explore: Fix label and history suggestions
2018-11-30 16:16:16 +01:00
David Kaltschmidt 47468fca68 Explore: Show logging errors from backend
- Logging datasource sends error string directly in the message body
- allowing response body to be an error when query transaction failed
- added throw in case we ever encounter unhandled errors again (forces us to fix the issue)
2018-11-30 16:09:56 +01:00
Erik Sundell 12ba314e24 change obj order when merging so that correct format is being used 2018-11-30 15:58:01 +01:00
David Kaltschmidt 11a53763e2 Explore: Fix logging query parser for regex with quantifiers
- ensure that selectors have to be preceded by whitespace or line beginning
- glacing over the fact that ` {0,1}` could be a valid regexp, but we're using space as query/regexp separators anyway, so I think it's fine for now
2018-11-30 15:49:54 +01:00
Minamiya_Natsuki ecddf9d408 Update README.md 2018-11-30 22:47:57 +08:00
David 088c2e70d8 Merge pull request #14236 from grafana/davkal/explore-logging-rendeer
Explore: Logging render performance
2018-11-30 15:37:24 +01:00
David Kaltschmidt a513130493 Fixed typo in function name 2018-11-30 15:19:09 +01:00
David Kaltschmidt a61c8d23d4 Explore: Fix label and history suggestions
- fork promql's tokenizer (need to specify that labels context can only follow beginning of line or whitespace)
- remove unneeded syntax features
- only present history items when field is empty
2018-11-30 15:13:53 +01:00
Peter Holmberg de9137a7c7 tidy import 2018-11-30 14:32:29 +01:00
Marcus Efraimsson 624e5e5b3d let each sql datasource handle timeFrom and timeTo macros 2018-11-30 14:30:02 +01:00
Erik Sundell 4f38af12a8 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 14:18:33 +01:00
Torkel Ödegaard 1db3885283 style changes for panel placeholder (move and resize) effect 2018-11-30 05:14:23 -08:00
Erik Sundell 3c556c4833 never load fallback query field. remove commented code 2018-11-30 13:53:39 +01:00
Erik Sundell be85944d84 add an error alert component that will be displayed when there was an error loading ds in explore 2018-11-30 13:51:49 +01:00
Torkel Ödegaard 222f26ea80 Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-30 04:46:39 -08:00
Torkel Ödegaard 6c09373995 fix: minor style changes, removed hover scale increase 2018-11-30 04:45:25 -08:00
Johannes Schill 0b65558c21 react-panel: Add nullcheck to prevent error on datasources without meta options 2018-11-30 13:42:49 +01:00
Johannes Schill e0fb89cf54 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 13:39:46 +01:00
Johannes Schill 363425d55e react-panel: Options button should always be enabled now when Time Range-options are there 2018-11-30 13:39:06 +01:00
Johannes Schill d02839d2d1 react-panel: Move time range options to its own component and render it under the options button instead 2018-11-30 13:36:53 +01:00
Peter Holmberg 4c6897b411 created color enum 2018-11-30 13:17:17 +01:00
Torkel Ödegaard a6c4ba4dfb Merge pull request #14242 from grafana/various-style-fixes
Fixed styling issues with new checkbox style
2018-11-30 12:52:24 +01:00
Erik Sundell e55a0cceff Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 12:50:16 +01:00
Erik Sundell c40bfb8eda make sure target obj is not destructured so that angular copy of objected can be mutated 2018-11-30 12:49:05 +01:00
David Kaltschmidt 979f3f3e0c Review feedback
- fixed typo
- moved result calculation to explore utils
- use component keys instead of componentWillReceiveProps
- require logs to have and id, to as use as Logs component key
- render delay based on row count
2018-11-30 12:26:57 +01:00
Johannes Schill 58da6e8c26 react-panel: Add test for Input with validation on blur 2018-11-30 12:26:45 +01:00
Johannes Schill c722ea4f76 react-panel: Input validation should be optional 2018-11-30 11:04:56 +01:00
Torkel Ödegaard cc210b11fb Merge branch 'panel-edit-in-react' into various-style-fixes 2018-11-30 01:46:41 -08:00
Torkel Ödegaard 6cbbffffb9 Merge pull request #14198 from grafana/panel-edit-in-react-query-inspector
Panel edit in react query inspector
2018-11-30 10:40:11 +01:00
Johannes Schill a8e184c025 react-panel: Clean up input validation and increase code readability 2018-11-30 10:21:55 +01:00
Johannes Schill 69ae3d2e6a react-panel: Time range options moved to "Queries" tab 2018-11-30 10:21:54 +01:00
Johannes Schill b7fcef3351 react-panel: Remove mock response button for now 2018-11-30 10:21:54 +01:00
Johannes Schill a03900e6cf react-panel: Remove comments and improve readability in render() 2018-11-30 10:21:54 +01:00
Johannes Schill 3908e64ef0 react-panel: Use correct type for children prop to avoid the use of fragments <></> 2018-11-30 10:21:54 +01:00
Johannes Schill 13d0a11798 react-panel: Remove json-formatter-js since we will continue with the "patched" version 2018-11-30 10:21:54 +01:00
Johannes Schill 23ae1c7184 react-panel: Move all query inspector logic into QueryInspector component and start with the "Mock response" 2018-11-30 10:21:54 +01:00
Johannes Schill 857bd3d8ad react-panel: Toggle Expand/Collapse json nodes in Query Inspector 2018-11-30 10:21:54 +01:00
Johannes Schill 8254086ecb react-panel: Add CopyToClipboard-component and separate QueryInspector to its own component from QueriesTab 2018-11-30 10:21:53 +01:00
Johannes Schill be67801e84 react-panel: Trigger panel refresh when opening inspector. Add loading-message 2018-11-30 10:21:53 +01:00
Johannes Schill 6242379915 react-panel: Replace JSONFormatter npm package with the current monkey patched JsonExplorer 2018-11-30 10:21:53 +01:00
Johannes Schill 5cca489acd react-panel: Clean up the JSONFormatter and make sure it updates both on mount and when props update 2018-11-30 10:21:53 +01:00
Johannes Schill 348f2e4ec4 react-panel: Get real datasource query for query inspector 2018-11-30 10:21:53 +01:00
Johannes Schill 82ce733e9e react-panel: Create component for JSON formatting and use it on query inspector 2018-11-30 10:21:53 +01:00
Marcus Efraimsson 1052b17af8 changelog: add notes about closing #14167 2018-11-30 09:53:21 +01:00
Marcus Efraimsson e2e66ae608 Merge pull request #14238 from mmcoltman/14167-cloudwatch_add_codebuild
Add AWS/CodeBuild namespace for CloudWatch datasource
2018-11-30 00:50:27 -08:00
Erik Sundell 3d45b5ba73 make getAll return array instead of object 2018-11-30 09:48:59 +01:00
Erik Sundell df75fb0e6d remove obsolete test 2018-11-30 09:32:36 +01:00
Minamiya_Natsuki 2db3464044 Update README.md
add notice to MacOS Docker user, if docker  memory limit is less than 2GiB, build process may fail when run ./node_modules/.bin/grunt build
2018-11-30 12:59:10 +08:00
Matthew Coltman bbd0ec3a8b Add AWS/CodeBuild namespace for CloudWatch datasource 2018-11-29 21:02:44 +01:00
Torkel Ödegaard 93ac4e4717 Fixed styling issues with new checkbox style 2018-11-29 18:39:02 +01:00
Mario Trangoni e4771a88dd Fix other misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon -e destory -e yarn -e adn -e Spindel
2018-11-29 18:15:16 +01:00
Mario Trangoni 5d60d323e2 docs/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon | grep docs
2018-11-29 18:14:20 +01:00
Mario Trangoni 9c1b4793a6 CHANGELOG.md: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -v -e vendor -e node_modules -e devenv | grep CHANGELOG.md
./CHANGELOG.md:163:60: "organisation" is a misspelling of "organization"
./CHANGELOG.md:286:13: "Litre" is a misspelling of "Liter"
./CHANGELOG.md:394:163: "Spindel" is a misspelling of "Spindle"
./CHANGELOG.md:421:51: "metre" is a misspelling of "meter"
./CHANGELOG.md:738:73: "dashboad" is a misspelling of "dashboard"
./CHANGELOG.md:903:18: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1031:48: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1170:51: "cancelled" is a misspelling of "canceled"
./CHANGELOG.md:1874:97: "muliple" is a misspelling of "multiple"
./CHANGELOG.md:1909:60: "fullscren" is a misspelling of "fullscreen"
2018-11-29 18:14:20 +01:00
David Kaltschmidt ae26f7126f Explore: Logging render performance
- moved from grid to flexbox
- calculate Explore results only when query transactions change to prevent expensive re-renders
- split up rendering of graph and log data
- render log results in 2 stages
2018-11-29 17:30:11 +01:00
Peter Holmberg ea3e1a5876 remove log 2018-11-29 15:47:30 +01:00
Peter Holmberg ef3c913981 min and max value 2018-11-29 15:23:16 +01:00
Peter Holmberg 60ec00ae52 update gauge on remove threshold 2018-11-29 15:07:31 +01:00
Peter Holmberg 201bd69a6a user added thresholds state 2018-11-29 15:04:49 +01:00
Peter Holmberg efb71d1026 console logs and code layout 2018-11-29 14:22:43 +01:00
Erik Sundell a4154fa925 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-29 14:20:55 +01:00
Erik Sundell d1a2488392 pass data correctly to event handler 2018-11-29 14:20:15 +01:00
Peter Holmberg b856ae3957 revert Label change 2018-11-29 14:12:18 +01:00
Peter Holmberg 909fe47050 update color on gauge when changing 2018-11-29 13:44:35 +01:00
David 8024a6aa9f Merge pull request #14214 from grafana/davkal/explore-logging-label-filter
Explore: Logging label filtering
2018-11-29 13:19:35 +01:00
Pavel 01c2a43699 Merge pull request #1 from grafana/master
Update local master
2018-11-29 12:40:55 +02:00
ijin08 46ec9bd6ad Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-29 10:51:56 +01:00
Erik Sundell 3162dda088 remove explore check - make it possible to load all datasources 2018-11-29 10:46:50 +01:00
Erik Sundell 58931c1316 add table support flag for stackdriver 2018-11-29 10:39:36 +01:00
Erik Sundell d9236c1081 add table support flag for prometheus 2018-11-29 10:39:24 +01:00
Erik Sundell e544f2bc74 add table support flag for postgres 2018-11-29 10:39:13 +01:00
Erik Sundell 699f6aecc6 add table support flag for opentsdb 2018-11-29 10:39:00 +01:00
Erik Sundell e635005626 add table support flag for mysql 2018-11-29 10:38:45 +01:00
Erik Sundell 00d8e1f221 add table support flag for mssql 2018-11-29 10:38:33 +01:00
Erik Sundell 71f6235a8c add table support flag for logging 2018-11-29 10:38:20 +01:00
Erik Sundell d66d2ae749 add table support flag for graphite 2018-11-29 10:38:04 +01:00
Carl Bergquist 9b20c9c3a5 Merge pull request #14225 from zicklam/patch-3
removed extra whitespace
2018-11-29 10:00:09 +01:00
Carl Bergquist 486ece329b Merge pull request #14227 from zicklam/patch-4
added google_tag_manager_id from defaults.ini
2018-11-29 09:59:35 +01:00
Florian Zicklam 3000818ab3 added google_tag_manager_id from defaults.ini 2018-11-29 09:30:03 +01:00
Florian Zicklam d86ba20d10 removed extra whitespace
removed extra whitespace
2018-11-29 09:21:06 +01:00
Carl Bergquist 9785a8aba0 Merge pull request #14219 from orojina/patch-1
Update export_import.md
2018-11-29 08:24:09 +01:00
Omar Alejandro González Rojina 804bd822d0 Update export_import.md
Grafana v5.3.4 shows a new checkbox in the export modal "Export for sharing externally". If the checkbox is not checked then the "__inputs" section wont be included into the exported JSON file, would be great to add that note into the documentation for others to avoid confusions.
2018-11-28 11:17:36 -06:00
ijin08 2c943d9aec added new icons, fixed so different icons in different themes, added animation to hover on icons, styled choose visualization and datasource for both themes, made som styling adjustments to whole panel editor 2018-11-28 15:51:45 +01:00
Peter Holmberg 460d642b06 sorting tests 2018-11-28 15:43:49 +01:00
Peter Holmberg e74db94a27 remove border 2018-11-28 15:25:10 +01:00
Peter Holmberg 3066f895fa color indicator 2018-11-28 15:23:14 +01:00
Erik Sundell 6f85fa6b35 add new flag in order to be able to indicate whether the datasource has native support for tables 2018-11-28 15:06:22 +01:00
Erik Sundell 18abd987bb prevent explore from crashing when table is not present in response 2018-11-28 14:31:20 +01:00
David Kaltschmidt c3b67f3a13 Explore: Logging label filtering
- adds a custom label renderer to Logs viewer in Explore
- labels are no longer treated as strings, they are passed as parsed objects to the log row
- label renderer supports onClick handler for an action
- renamed Explore's `onClickTableCell` to `onClickLabel` and wired up log label renderers
- reuse Prometheus `addLabelToSelector` to modify Logging queries via click on label
- added tests to `addLabelToSelector`, changed to include the surrounding `{}`
- use label render also for common labels in the controls panel
- logging meta data section has now a custom renderer that can render numbers, strings, and labels
- style adjustments
2018-11-28 14:20:10 +01:00
David 8830c133d1 Merge pull request #14215 from grafana/davkal/fix-logging-selector-parsing
Logging: fix query parsing for selectors with multiple labels
2018-11-28 14:17:32 +01:00
David Kaltschmidt 9c316b55e9 Logging: fix query parsing for selectors with multiple labels
- simplify selector parsing
- added tests
2018-11-28 14:03:47 +01:00
Peter Holmberg 638c04e16b using percentage to not hide search when smaller screen 2018-11-28 11:41:40 +01:00
David 32511533c3 Merge pull request #14178 from grafana/davkal/explore-scan-log-range
Explore: Scan for older logs
2018-11-28 11:00:51 +01:00
Leonard Gram ce9e1a8f38 build: explaining the linux build. 2018-11-28 09:25:48 +01:00
Ryan McKinley b3e6da0cbd check for null with toLocalString (#14208) 2018-11-28 00:24:59 -08:00
Torkel Ödegaard 2faf8c722f Fix elastic ng-inject (build issue) (#14195)
fix elastic ng-inject issue in query editor
2018-11-28 00:20:49 -08:00
Ryan 1e94127070 Merge remote-tracking branch 'grafana/master' 2018-11-27 10:00:24 -08:00
Erik Sundell 4eebede9ef add current editor to panel targets 2018-11-27 16:50:09 +01:00
David Kaltschmidt 593cc38cfc Added stop scan button 2018-11-27 16:35:37 +01:00
David Kaltschmidt 4803b8f3c0 Explore: Scan for older logs
Sometimes log streams dont return any lines for the given range. Would be great to automate the search until some logs are found.

- Allow Explore to drive TimePicker via ref
- Show `Scan` link in Logs when there is no data
- Click on `Scan` sets Explore into scanning state
- While scanning, tell Timepicker to shift left
- TimePicker change triggers new queries with shifted time range
- Remember if query transaction was started via scan
- keep scanning until something was found
- Manual use of timepicker cancels scanning
2018-11-27 15:56:10 +01:00
Peter Holmberg 2919fe1d6a color picker 2018-11-27 15:06:39 +01:00
Erik Sundell 626a94be46 remove time srv initialization 2018-11-27 14:51:03 +01:00
Erik Sundell 7159b369a3 restructure imports 2018-11-27 14:49:03 +01:00
Erik Sundell 5e7d4beacf get intervals from explore function 2018-11-27 14:45:39 +01:00
Erik Sundell b36db6ac04 unregister all query editor event listeners 2018-11-27 14:27:33 +01:00
Erik Sundell c79d8b2a9b remove comments 2018-11-27 14:25:24 +01:00
Erik Sundell c567d75320 temp remove until stackdriver implements explore 2018-11-27 14:22:39 +01:00
Peter Holmberg b506697eda sort on value 2018-11-27 13:42:13 +01:00
Erik Sundell 1998c08df5 use default range from time picker 2018-11-27 13:13:26 +01:00
David 9afb8b64ed Merge pull request #14176 from grafana/davkal/explore-logging-level-filter
Explore: Filter logs by log level
2018-11-27 12:23:45 +01:00
Mattia Rossi ce74b1ddc2 Requested Backend changes, removed link in popover description for the offset field 2018-11-27 03:42:20 -05:00
Torkel Ödegaard 15637af1af Merge pull request #14197 from qhartman/patch-1
Remove confusing <> from variable intro
2018-11-27 00:03:23 +01:00
Quentin Hartman 02a7916b26 Remove confusing <> from variable intro
The existing intro makes it look like you should use `$<varname>` to refer to a variable. That of course is incorrect, and you should use `$varname`. In my experience using the <> marker around variable names should only be used when there isn't something else explicit to set it off. In this case we have `$`. Below, you can see the <> are also not used, because we have the `[[]]` to set it off. The inconsistency is confusing.
2018-11-26 15:33:13 -07:00
Erik Sundell 109ff1a3e1 includes ranges correctly in the options object 2018-11-26 17:09:50 +01:00
Leonard Gram bccce9922a docker: Upgrades base packages in the images.
Related to #14182
2018-11-26 16:41:46 +01:00
Peter Holmberg ff606891e2 small fixes 2018-11-26 16:21:54 +01:00
Marcus Efraimsson d9ff831bac Merge pull request #14194 from danielbh/pause-all-alerts-docs-fix
chore: correct pause-all-alerts auth in docs
2018-11-26 06:57:08 -08:00
Peter Holmberg aac1b6c57b logic for adding rows, styling 2018-11-26 15:52:50 +01:00
Marcus Efraimsson c0bf7c5f13 Merge pull request #14140 from grafana/fix_dashboard_service_log
log the actual error if failing to update alert data
2018-11-26 06:49:19 -08:00
Daniel Hollcraft 4a2e9b4bfa chore: correct pause-all-alerts auth in docs 2018-11-26 09:43:26 -05:00
Mattia Rossi f6fc7f7b64 Requested Backend changes, added details to popover description for the offset field 2018-11-26 08:58:25 -05:00
Marcus Efraimsson 46c6594744 Merge pull request #14163 from grafana/14155_whats_new
docs: what's new in v5.4
2018-11-26 05:28:57 -08:00
David 2257f63543 Merge pull request #14192 from grafana/davkal/fix-14190
Explore: Fix JS error when switching between 2 prometheus datasources
2018-11-26 14:20:16 +01:00
Erik Sundell 3395b1caf6 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-26 13:44:32 +01:00
David Kaltschmidt 91ea8dccf5 Explore: Fix JS error when switching between 2 prometheus datasources
- since the DataQuery rewrite, Explore starts by submitting its queries (Explore cant know if the queries are emtpty)
- The datasource intercepts an empty query and returns an empty list of time series, and also no table for the table query.
- The query hinter then received no series to analyse and was not guarding against this.
- This PR adds this guard.
2018-11-26 13:43:22 +01:00
Peter Holmberg 1ca0d1deab color touches 2018-11-26 10:38:43 +01:00
Mattia Rossi 9825484176 Add support for Offset in elasticsearch datasource, date_histogram aggregation, fixes grafana #12653 2018-11-24 10:48:29 -05:00
Torkel Ödegaard efcbb92b3f Merge pull request #14170 from grafana/davkal/explore-prometheus-range-sort
Sort Prometheus range suggestions by length
2018-11-23 19:22:24 +01:00
David Kaltschmidt 575d888472 Fix tests to account for sortText 2018-11-23 16:53:46 +01:00
Leonard Gram 539036fd0f build: always test publisher. 2018-11-23 16:51:01 +01:00
Leonard Gram 82c98a5ff4 build: packages linked to dl.grafana.com. 2018-11-23 16:51:01 +01:00
David Kaltschmidt ae5ec44171 Fix tests to account for loglevel long names 2018-11-23 16:49:23 +01:00
David Kaltschmidt 4f55a238ed Explore: Filter logs by log level
- add `onToggleSeries` to Explore Graph props
- toggling a Logging Graph series from the legend propagates its hidden series to Logs
- Logs translates hidden series alias to LogLevels
- Logs filters out hidden log levels
2018-11-23 16:29:55 +01:00
Peter Holmberg e1eb7ca571 styling 2018-11-23 16:25:46 +01:00
Peter Holmberg 5c992ba13a created test for some functions 2018-11-23 16:12:53 +01:00
Marcus Efraimsson 1949c8eb57 update changelog 2018-11-23 15:41:47 +01:00
Erik Sundell 7209c7cd0a mock interval data 2018-11-23 15:37:49 +01:00
Marcus Efraimsson 81a426f05d Merge pull request #14175 from grafana/11977_regression
Regression: fix handle of elasticsearch 6.0+ version
2018-11-23 06:36:51 -08:00
Marcus Efraimsson a022284cb0 fix handle of elasticsearch 6.0+ version 2018-11-23 15:24:16 +01:00
Erik Sundell 1e6ea8b124 rename variable 2018-11-23 15:15:41 +01:00
Erik Sundell 65c744c39f hide row specific buttons when query editor is rendered from explore 2018-11-23 15:14:13 +01:00
Erik Sundell ccddee4a4a add support for explore events 2018-11-23 15:12:20 +01:00
Torkel Ödegaard 92c5755175 minor style fix 2018-11-23 15:10:45 +01:00
Torkel Ödegaard 39a1b11cb3 minor fixes 2018-11-23 15:01:36 +01:00
Marcus Efraimsson df218961e0 docs: various fixes of what's new in v5.4 2018-11-23 14:45:32 +01:00
Erik Sundell fae3ae2580 use plugin_loader directly instead of using the wrapper 2018-11-23 14:32:56 +01:00
Marcus Efraimsson 9aa4d71550 docs: fix old ldap url redirect 2018-11-23 14:31:21 +01:00
Torkel Ödegaard daee874ee6 Merge branch 'panel-edit-in-react' into panel-edit-in-react-sidemenu 2018-11-23 14:01:18 +01:00
Torkel Ödegaard 263381eac6 Merge branch 'develop' into panel-edit-in-react 2018-11-23 14:00:15 +01:00
Torkel Ödegaard 2dc44f6089 Merge branch 'master' into develop 2018-11-23 13:59:35 +01:00
Torkel Ödegaard 5038efe09e Merge branch 'master' into davkal/babel-7 2018-11-23 13:44:59 +01:00
Torkel Ödegaard fd71abc301 fixed issue with babel plugin proposal class properties that initiated
properties to void 0. This breaks angularjs preAssignBinding which
applies bindings to this before constructor is called. Fixed by
using fork of babel plugin.

https://github.com/babel/babel/issues/8417
2018-11-23 13:41:45 +01:00
David f4bc023147 Merge pull request #14171 from grafana/davkal/explore-fix-empty-suggestion
Explore: make query field suggestions more robust
2018-11-23 13:14:30 +01:00
David Kaltschmidt f831836fa7 Explore: make query field suggestions more robust
- drop invalid history items
- make highlighter more robust by defaulting to empty string on text to highlight
2018-11-23 12:25:43 +01:00
flopp999 91d97ab5b5 Fix abbreviations of Litre/min and milliLitre/min (#14114) 2018-11-23 02:48:22 -08:00
David 16e7ae4e69 Merge pull request #14169 from grafana/davkal/explore-logging-keep-labels
Explore: switching to logging should keep prometheus labels in case o…
2018-11-23 11:47:39 +01:00
David Kaltschmidt ecaee88efe Sort Prometheus range suggestions by length
- add sortText property to range completion items
2018-11-23 11:43:21 +01:00
Marcus Efraimsson b55b9261f0 docs: what's new in v5.4 2018-11-23 11:15:53 +01:00
David Kaltschmidt b778b5350a Explore: swtiching to logging should keep prometheus labels in case of error
Logging's query importer drops all labels that are not common to both datasources.

- keep labels if label lookup of logging datasource came back empty
- easier to remove labels than having to add them in the first place
2018-11-23 11:15:25 +01:00
Torkel Ödegaard 56d95e7913 tweaks to gf-inline-form style PR #14154 change 2018-11-23 08:06:48 +01:00
Torkel Ödegaard ec23b4c607 Merge pull request #14154 from bergquist/gf-form-margin
Margin when listing multiple gf-form
2018-11-23 08:05:28 +01:00
Torkel Ödegaard 81cc24c123 Merge branch 'davkal/sticky-footer' 2018-11-23 07:50:47 +01:00
Torkel Ödegaard 0cb47cb3d4 Merge pull request #14162 from grafana/docs_signout_redirect_url
docs: signout_redirect_url description in auth overview
2018-11-23 07:46:24 +01:00
Torkel Ödegaard 9caae8c8c0 adding back button 2018-11-23 07:43:25 +01:00
Torkel Ödegaard c8e42c0216 styling tweaks 2018-11-23 07:31:13 +01:00
Erik Sundell eaf9a0b39a initial commit 2018-11-22 18:22:15 +01:00
Marcus Efraimsson 5ebb201caa docs: signout_redirect_url description in auth overview 2018-11-22 15:59:15 +01:00
Torkel Ödegaard f8b1484265 minor style changes 2018-11-22 15:34:55 +01:00
Erik Sundell 1fb686cafa Merge branch 'develop' into panel-edit-in-react 2018-11-22 13:46:12 +01:00
Erik Sundell a5947e820c Merge branch 'master' into develop 2018-11-22 13:43:25 +01:00
David Kaltschmidt c928c546a3 Sticky footer for all pages
Currently the footer is based on top margins which looks odd on big screen sizes.
Also, the footer shows up on the top of the page on pages take a moment to load (while ng-view is rendering).

- True sticky footer based on flexbox
- Ensure footer stays at bottom while ng-view div does not exist yet
2018-11-22 13:15:29 +01:00
Torkel Ödegaard 300bd75b54 edit mode styling 2018-11-22 12:22:59 +01:00
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
David 377eaa891c Merge pull request #14147 from grafana/davkal/explore-data-query
Explore: Introduce DataQuery interface for query handling
2018-11-22 12:01:37 +01:00
David Kaltschmidt 9e94d22401 Added comments 2018-11-22 12:00:41 +01:00
Torkel Ödegaard 547044b65f style tweaks 2018-11-22 11:41:33 +01:00
Peter Holmberg 142cd92b54 render and sort 2018-11-22 11:41:09 +01:00
Marcus Efraimsson 36aec52c08 return actual error if failing to update alert data 2018-11-22 11:19:08 +01:00
David Kaltschmidt 21ee85b1e2 Fix issue with deleting a query (empty string not updating) 2018-11-22 11:14:46 +01:00
David Kaltschmidt bbaa5b63c8 Fix history rendering for DataQuery 2018-11-22 11:02:53 +01:00
bergquist dc2ebeb7c0 margin when listing multiple gf-form should be right
when listing multiple gf-form elements this style is
applied to all elements except the first. By having the
margin on the right side there will always be some margin
between all gf-forms
2018-11-22 11:00:27 +01:00
Marcus Efraimsson dffb4c8a46 Merge pull request #14153 from zyseeker/patch-1
Fix a typo in doc about alerting
2018-11-22 00:17:56 -08:00
Torkel Ödegaard 9a2b2863fb styling progress 2018-11-22 08:46:54 +01:00
Zhang Yong 4f236ca465 Fix a typo
Fix a typo
2018-11-22 15:17:31 +08:00
Torkel Ödegaard c7e296307a panel edit ux experiments 2018-11-21 20:32:04 +01:00
Marcus Efraimsson 572ca5a010 changelog: add notes about closing #14150 2018-11-21 18:28:05 +01:00
Marcus Efraimsson 40a38552a9 Merge pull request #14151 from grafana/14150_cloudwatch
Fix invalid time range causes panic in Cloudwatch datasources
2018-11-21 09:23:51 -08:00
Marcus Efraimsson a6a1362ad1 temporary fix for starting grafana not running systemd 2018-11-21 18:15:28 +01:00
Marcus Efraimsson 3534762f49 cloudwatch: handle invalid time ranges 2018-11-21 17:51:02 +01:00
Marcus Efraimsson 879aed7d06 cloudwatch: recover/handle panics when executing queries 2018-11-21 17:49:17 +01:00
David 1125ca4d79 Merge pull request #14014 from miqh/feat/explore-toggle-series
Add ability to toggle visibility of graph series in explore section
2018-11-21 17:31:46 +01:00
Carl Bergquist c3d64e0352 Merge pull request #14148 from bergquist/alerting_options_to
updates time range options for alert queries
2018-11-21 17:25:32 +01:00
Carl Bergquist acf8d43682 Merge pull request #14056 from mjtrangoni/fix-errcheck-issues
Fix errcheck issues
2018-11-21 17:23:56 +01:00
David Kaltschmidt 331d419d4f Combine query functions 2018-11-21 17:21:13 +01:00
David Kaltschmidt 22987ee75f Renamed targets to queries 2018-11-21 16:28:30 +01:00
ijin08 e47fc40b13 added icons for panel-edit side menu 2018-11-21 16:05:01 +01:00
bergquist 14688766ef updates time range options for alert queries
add some new options for the to value.
removes '1s' option for from since thats unreasonable low

closes #12134
2018-11-21 15:43:37 +01:00
bergquist 60c291c8dc format: remove </input> and align tabs 2018-11-21 15:42:25 +01:00
Peter Holmberg a061de8333 updating state 2018-11-21 15:18:12 +01:00
Carl Bergquist c852acaeca Merge pull request #14143 from bergquist/docs_alerting_for
Adds example timeline in docs for alerting for
2018-11-21 15:15:39 +01:00
David Kaltschmidt b3161bea5a Explore: Introduce DataQuery interface for query handling
- Queries in Explore have been string based
- This PR introduces the use of the DataQuery type to denote all queries handled in Explore
- Within Explore all handling of DataQueries is transparent
- Modifying DataQueries is left to the datasource
- Using `target` as variable names for DataQueries to be consistent with the rest of Grafana
2018-11-21 14:45:57 +01:00
Michael Huynh a333c31ea8 Fix set utilities for explore section
Discovered implementation issues with the set utilities used in the
explore section after adding some tests. Added tests to reinforce the
expected behaviour of the utility functions.

Related: #13522
2018-11-21 21:42:53 +08:00
Marcus Efraimsson f74a7cd97c typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:51 +01:00
Marcus Efraimsson fdbccdc347 typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:35 +01:00
Torkel Ödegaard 1976e18591 Merge pull request #14145 from grafana/fix-legend-show-false
fixed issue with new legend not checking if panel.legend.show
2018-11-21 14:40:09 +01:00
Torkel Ödegaard 0731b8635b fixed failing graph tests 2018-11-21 13:53:32 +01:00
bergquist 4bd8b2c130 gfdev: fixes unparseable for duration 2018-11-21 11:41:54 +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
Torkel Ödegaard cab92f88af fixed issue with new legend not checking if panel.legend.show 2018-11-21 11:38:15 +01:00
bergquist afbc16c499 gfdev: adds alert always in pending state 2018-11-21 11:34:21 +01:00
bergquist 1491ea1c75 docs: adds example timeline for alerting for 2018-11-21 11:11:46 +01:00
Leonard Gram 6c267cb592 build: docker build for ge. 2018-11-21 09:03:05 +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
bergquist baba8a92ee update path to alerting for image 2018-11-20 17:09:21 +01:00
Peter Holmberg 6084275119 started on thresholds 2018-11-20 17:01:58 +01:00
Johannes Schill 97f7a7fbba react-panel: Add data source "options". Needs UX, WIP. 2018-11-20 16:33:26 +01:00
Marcus Efraimsson e421c387ea update release publish script links 2018-11-20 16:23:24 +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
Michael Huynh c7dc557e91 Add visibility toggle for explore graph series
The implemented toggling UX is similar to how the dashboard graph plugin
behaves. Also incorporates review feedback to persist series visibility
state by means of the alias property, with the limitation it carries
too.

Related: #13522
2018-11-20 21:52:42 +08:00
Marcus Efraimsson 8d75fcb6f7 what's new in v5.4 placeholder 2018-11-20 14:35:38 +01:00
Peter Holmberg ac94fc9341 fix label and default threshold 2018-11-20 14:27:23 +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
Marcus Efraimsson 0b3e5ec4a7 Merge pull request #14137 from grafana/webpack-error-template-fix
fix for issue with error view in production builds
2018-11-20 04:59:12 -08:00
Torkel Ödegaard 34c70ca7ce fix for issue with error view in production builds 2018-11-20 13:47:45 +01:00
Daniel Lee 42d5003be3 changelog: adds note for #13561 2018-11-20 13:43:48 +01:00
Daniel Lee 4aeea56342 Merge pull request #14007 from grafana/stackdriver-template-query-editor
Stackdriver template query editor
2018-11-20 13:41:18 +01:00
Marcus Efraimsson 55fefde2a0 update changelog 2018-11-20 13:23:44 +01:00
Erik Sundell 7021e07ab2 stackdriver: remove not used variable 2018-11-20 13:22:43 +01:00
Torkel Ödegaard 5402a0e00d fixed menu to go to panel view mode 2018-11-20 13:18:48 +01:00
Erik Sundell b200f92710 stackdriver: use angular dropdown so that we can restrict user input 2018-11-20 13:18:00 +01:00
Erik Sundell 7fc8ed942f stackdriver: make sure object type queries are also checked for vtemplate variables 2018-11-20 12:30:31 +01:00
Torkel Ödegaard 3b76d9ee17 minor style update 2018-11-20 11:26:01 +01:00
bergquist 8bd0aeb56e changelog: adds note about closing #13577 2018-11-20 11:21:17 +01:00
Carl Bergquist db8bd8298a Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth
Add basic authentication support to metrics endpoint
2018-11-20 11:19:55 +01:00
bergquist c999394b49 adds basic auth configuration to default.ini 2018-11-20 11:07:39 +01:00
Torkel Ödegaard 0575307786 added header section to legacy tabs 2018-11-20 11:06:36 +01:00
Erik Sundell aa65796ee1 stackdriver: reset defaults.ini 2018-11-20 10:00:01 +01:00
Marcus Efraimsson b948c9bdf5 changelog: add notes about closing #14120 2018-11-20 09:59:35 +01:00
Marcus Efraimsson 9cc6c2128a Merge pull request #14120 from supercharlesliu/user-teams
Add API GET /api/users/:id/teams for GrafanaAdmin
2018-11-20 00:56:35 -08:00
Torkel Ödegaard 7f46b75330 Merge branch 'develop' into panel-edit-in-react 2018-11-20 09:51:06 +01:00
Marcus Efraimsson 49bf003df1 Merge pull request #14132 from cloudshapes/revert-14092-record-full-url-in-google-analytics
Revert "Update google analytics code to submit full URL not just path"
2018-11-20 00:49:46 -08:00
Marcus Efraimsson 8ec7fd56d4 changelog: add notes about closing #14129
[skip ci]
2018-11-20 09:47:24 +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
supercharlesliu a241f67fba Add doc for api "GET /api/users/:id/teams" 2018-11-20 10:17:46 +08:00
Bob Shannon 16ff8a182b Re-organize packages and add basic auth test 2018-11-19 13:54:13 -05:00
Roland Dunn fa2c46edb9 Revert "Update google analytics code to submit full URL not just path" 2018-11-19 18:21:37 +00: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
Peter Holmberg 4e1f49f883 refactor options, show labels and markers 2018-11-19 17:11:17 +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
Erik Sundell fa32310f8a stackdriver: add query keyword to service, metric and project since these were the only fields in the editor that was missing it in the whole editor 2018-11-19 16:37:42 +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
Erik Sundell 19d1d7f35a stackdriver: add query keyword style to query fields 2018-11-19 16:26:06 +01:00
Erik Sundell 164e9a4f9a stackdriver: fix failing test 2018-11-19 16:19:56 +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
Erik Sundell 0ec4491a52 stackdriver: reimplementing service variable query type 2018-11-19 16:06:30 +01:00
Peter Holmberg e0064ed38e Revert "typo fix"
This reverts commit 9ded648bc5.
2018-11-19 16:05:46 +01:00
Peter Holmberg 9ded648bc5 typo fix 2018-11-19 16:05:15 +01:00
Peter Holmberg 22e64eb287 prefix and suffix 2018-11-19 16:00:18 +01:00
Peter Holmberg 37729bf9f1 decimals 2018-11-19 15:50:51 +01:00
Marcus Efraimsson 0d30f3ba52 update snapshot 2018-11-19 14:57:34 +01:00
Erik Sundell 795af5deed stackdriver: fix failing tests 2018-11-19 14:51:52 +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
Erik Sundell 6aaaadac21 stackdriver: update docs 2018-11-19 14:48:26 +01:00
Erik Sundell 0aeaec1ac6 stackdriver: add support for template variables 2018-11-19 14:44:40 +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
Torkel Ödegaard 0053bee886 Merge pull request #14121 from grafana/panel-size-in-edit-mode-fix
fixed issue with panel size when going into edit mode
2018-11-19 14:21:37 +01:00
Torkel Ödegaard 1157a62375 fixed issue switching back from mixed data source, introduced by react panels changes 2018-11-19 14:20:19 +01:00
Leonard Gram ac55aeff95 build: minor refactor. 2018-11-19 14:12:04 +01:00
Leonard Gram 8f0d3ff7ea build: fixes a bug where nightly rpm builds would be handled as stable. 2018-11-19 14:06:18 +01:00
Peter Holmberg a8cf2dc501 some touch ups on unit 2018-11-19 14:03:32 +01:00
bergquist 862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Marcus Efraimsson 638eca3cdb update changelog
[skip ci]
2018-11-19 13:59:20 +01:00
Leonard Gram 2d361eeabf builds: introduces enum for relase type. 2018-11-19 13:26:35 +01:00
Marcus Efraimsson c22e7f4263 fix group sync cta link 2018-11-19 13:23:17 +01:00
Peter Holmberg 5722773467 Merge branch 'unit-picker' into gauge-value-options 2018-11-19 13:13:32 +01:00
Peter Holmberg f72e751735 picker and functionaliy 2018-11-19 13:06:56 +01:00
Torkel Ödegaard d81d2f00f6 fixed issue with panel size when going into edit mode 2018-11-19 12:26:15 +01:00
Erik Sundell 26b1cc5dcf stackdriver: join resource and metric labels. split them in values and keys 2018-11-19 11:34:40 +01:00
Marcus Efraimsson 6c68976cab changelog: add notes about closing #13924
[skip ci]
2018-11-19 11:29:03 +01:00
Marcus Efraimsson 05a32d19be Merge pull request #14110 from vinicyusmacedo/master
Added google oauth account id
2018-11-19 02:21:11 -08:00
Leonard Gram e2007733f4 build: table-driven tests for publisher. 2018-11-19 11:20:44 +01:00
Marcus Efraimsson 60fd8ee9d4 fix id returned from google is a string 2018-11-19 11:11:13 +01:00
bergquist 8130067fd1 changelog: adds note about closing #7886 & #6202 2018-11-19 10:47:37 +01:00
Carl Bergquist 6049855dc7 Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Torkel Ödegaard c856c21b77 Merge pull request #14116 from cinaglia/fix-singlestat-xss
Mitigate XSS vulnerabilities in Singlestat panel
2018-11-19 10:36:44 +01:00
Marcus Efraimsson 959d7036a7 Merge pull request #14084 from xlson/internal-metrics-packaging
build: internal metrics for packaging.
2018-11-19 01:25:33 -08:00
bergquist 23b1fbcf48 changelog: adds note about closing #11893 2018-11-19 10:22:26 +01:00
Carl Bergquist 03ac9c5256 Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login
11893 oauth auto login
2018-11-19 10:21:33 +01:00
supercharlesliu 215242128b Fix param 2018-11-19 17:09:45 +08:00
supercharlesliu fb5c59c611 Add GET /api/users/:id/teams for orgAdmin 2018-11-19 17:08:10 +08:00
Johannes Schill 295fefb2dc Tooltip should be able to take up space when used on an absolute positioned element 2018-11-19 09:29:21 +01:00
Torkel Ödegaard 5d1c5502f1 minor fixes 2018-11-19 09:16:35 +01:00
Johannes Schill 5069c7f6bb panel-header: Move the corner information in the panel header to its own component 2018-11-19 09:16:35 +01:00
Marcus Efraimsson 919b1cd36c changelog: add notes about closing #12550
[skip ci]
2018-11-19 09:16:35 +01:00
Marcus Efraimsson 38b44799a3 fix selected home dashboard should show as selected even though its not starred 2018-11-19 09:16:35 +01:00
Johannes Schill 04571b8214 panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-19 09:16:35 +01:00
Marcus Efraimsson 3f1388f214 reload browser after preferences been updated 2018-11-19 09:16:35 +01:00
Johannes Schill 93586491f4 panel-header: Unmount popper when not needed. 2018-11-19 09:16:35 +01:00
Marcus Efraimsson 362ee89449 fix snapshot tests 2018-11-19 09:16:34 +01:00
Johannes Schill d6959c3b11 panel-header: Updated snapshots for popper 2018-11-19 09:16:34 +01:00
Johannes Schill 78e93a3a0f panel-header: Add fade in transition to tooltip 2018-11-19 09:16:34 +01:00
Torkel Ödegaard 32d72f345f Trying to reduce the amount of duplication with preferences 2018-11-19 09:16:34 +01:00
Johannes Schill 42154833cc panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-19 09:15:08 +01:00
Torkel Ödegaard 1984f28f49 filter out alpha plugins in api call, fixes #14030 2018-11-19 09:15:08 +01:00
Johannes Schill e5ea176a98 panel-header: Simplify condition 2018-11-19 09:15:08 +01:00
Johannes Schill 48d1a574b9 panel-header: Avoid undefined classNames and use the real panel description 2018-11-19 09:15:08 +01:00
Johannes Schill 7d74ca4a8d panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing 2018-11-19 09:15:08 +01:00
Johannes Schill 1fa85937bb panel-header: Bump @types/react, @types/react-dom, react, react-dom, react-popper to latest versions 2018-11-19 09:15:08 +01:00
Johannes Schill b97e2c7240 panel-header: Display description in modal 2018-11-19 09:15:08 +01:00
Marcus Efraimsson 2d92d217eb update changelog
[skip ci]
2018-11-19 09:15:08 +01:00
Marcus Efraimsson 0652d8bbe2 changelog: add notes about closing #11977
[skip ci]
2018-11-19 09:15:08 +01:00
Marcus Efraimsson 63e817e7c8 changelog: add notes about closing #6367
[skip ci]
2018-11-19 09:15:07 +01:00
Marcus Efraimsson db6af9eed1 docs: team http api update 2018-11-19 09:15:07 +01:00
stop-cran ec19306260 [elasticsearch] Do not set a placeholder to index name, if it's already specified. 2018-11-19 09:15:07 +01:00
bergquist bb66661cc6 changelog: adds note about closing #14043 2018-11-19 09:15:07 +01:00
Peter Holmberg 7b66120122 fixed issue with save. 2018-11-19 09:15:07 +01:00
Peter Holmberg f6aab0fe4b fixed mutability issue in dashboard dropdowns 2018-11-19 09:15:07 +01:00
David Kaltschmidt a1fad2d8d4 Explore: Fix table pagination styles
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
2018-11-19 09:15:07 +01:00
Marcus Efraimsson a251461c62 team preferences ui 2018-11-19 09:15:07 +01:00
Marcus Efraimsson b00542e194 feat: team preferences 2018-11-19 09:15:06 +01:00
David Kaltschmidt b2e6b2485f Explore: Dont set datasource in state if navigated away
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
2018-11-19 09:15:06 +01:00
Marcus Efraimsson ac3e175e54 fix switching from es raw document metric breaks query editor 2018-11-19 09:15:06 +01:00
bergquist 76cbd7f0de alerting: reduce the length of range queries
since we introduce deboucing the length should matter less.
But going below 5m as default might be weird depending on datasource.
2018-11-19 09:10:19 +01:00
Victor Cinaglia ba5a002323 Mitigate XSS vulnerabilities in Singlestat panel
Sanitize `prefix` and `postfix` fields. Re-arrange code slightly in order to handle variable
interpolation.
2018-11-18 20:33:36 -05:00
Patrick 2de5a7119b Merge branch 'master' into add_google_hangouts_chat_notifier 2018-11-18 22:00:53 +01:00
Victor Cinaglia 4ed0a3d29a Retain decimal precision when exporting CSV
Using `Number.prototype.toLocaleString()` has the unexpected behavior of truncating anything
exceeding 3 decimal digits on floats.

Additionally, it introduces inconsistencies (comma vs period separators) which could make processing the
output CSV harder than it could be.  The proposed solution here is to simply let numbers be cast
automatically via string concatenation.

Fixes #13929
2018-11-18 12:40:43 -05:00
Vinicyus Macedo 152261413d Added Id to BasicUserInfo returns 2018-11-17 12:05:06 -02:00
Torkel Ödegaard 435079c6e7 Merge pull request #14102 from grafana/change-tab-in-edit-modefix
fix: dont setViewMode when nothing has changed
2018-11-17 14:46:16 +01:00
Vinicyus Macedo 057f611194 Added google oauth account id 2018-11-17 00:48:54 -02:00
Torkel Ödegaard 8d39ca76be switch style tweaks 2018-11-16 12:45:19 -08:00
David Kaltschmidt adb2430a1b Explore: collapsible result panels
- replace the Graph/Table buttons with toggle control in a wrapper panel
- moved toggle control to left to be close to the label
- removed panel styles from Logs and Graph viewer
- moved loader animation to panel
2018-11-16 18:21:13 +00:00
Peter Holmberg 5916f76991 removing test page 2018-11-16 16:58:08 +01:00
Peter Holmberg cc7bf31c3e Merge remote-tracking branch 'origin/develop' into unit-picker 2018-11-16 16:54:02 +01:00
Peter Holmberg ee3b438269 format value 2018-11-16 16:41:01 +01:00
Peter Holmberg 02d8ffda5b default value 2018-11-16 16:35:42 +01:00
ijin08 ad8e9ae691 created classes for new checkbox and variables 2018-11-16 16:35:04 +01:00
David 634d71a657 Merge pull request #14052 from grafana/davkal/explore-query-importer
Explore: POC for datasource query importers
2018-11-16 14:55:19 +00:00
David Kaltschmidt e3e8be16b3 Prometheus: fix rules expansion
Rules expansion (available via query hints in explore) was broken for expressions that contained selectors.

- fix replacing regexp to recognize `{` and `[` as the end of a rule name
- moved logic to language utils
- added tests
2018-11-16 14:38:20 +00:00
Peter Holmberg 0f4131b8d7 handle default value 2018-11-16 15:26:51 +01:00
Torkel Ödegaard 57de2475b0 various fixes to angular loading 2018-11-16 15:09:14 +01:00
David Kaltschmidt 411719bc70 Explore: POC for datasource query importers
Explore is about keeping context between datasources if possible. When
changing from metrics to logging, some of the filtering can be kept to
narrow down logging streams relevant to the metrics.

- adds `importQueries` function in language providers
- query import dependent on origin datasource
- implemented  prometheus-to-logging import: keeping label selectors
  that are common to both datasources
- added types
2018-11-16 13:52:58 +00:00
Leonard Gram ac8731b9fb build: enabled darwin build. 2018-11-16 14:50:27 +01:00
Leonard Gram ce63f5c0ee Merge pull request #14103 from xlson/darwin-compatible-build
build: darwin compatible build env.

Fixes #13763
2018-11-16 14:48:24 +01:00
Peter Holmberg 8ab86c2ceb expand groups when searching 2018-11-16 14:40:24 +01:00
Leonard Gram badb36b3c8 build: darwin compatible build env. 2018-11-16 14:29:35 +01:00
Peter Holmberg 2b8eab8c8c maxHeight and style overrides 2018-11-16 14:11:51 +01:00
Marcus Efraimsson 2c7dfd74b4 Merge pull request #14100 from grafana/fix-save-redirect-issue
fix for save dashboard redirect issue
2018-11-16 04:03:47 -08:00
ijin08 c505fc3783 moved slider into label to make it clickable, styled slider in dark and light theme, created variables for slider 2018-11-16 13:02:29 +01:00
Marcus Efraimsson f528142655 Merge pull request #14089 from grafana/fixed-alert-tab-location
fixed alert tab order and fixed some console logging issues
2018-11-16 03:58:13 -08:00
Torkel Ödegaard 96104e4372 fix: dont setViewMode when nothing has changed 2018-11-16 12:39:26 +01:00
Torkel Ödegaard 907c84f7d8 Merge pull request #14099 from alexanderzobnin/fix-14098
fix datasource testing
2018-11-16 11:34:30 +01:00
Torkel Ödegaard e85a3f1d04 fix redirect issue, caused by timing of events between angular location change and redux state changes 2018-11-16 11:29:32 +01:00
Alexander Zobnin 8c7f4ac188 fix datasource testing 2018-11-16 13:17:41 +03:00
Torkel Ödegaard 7c72f8e028 panel options now load even when changing type 2018-11-16 10:44:39 +01:00
Torkel Ödegaard f21fe65bb1 fixed issues when changing type, need to remove event listeners and cleanup props 2018-11-16 10:00:13 +01:00
Leonard Gram 438f7d0332 build: refactoring. 2018-11-16 09:03:46 +01:00
Torkel Ödegaard dac02d3d73 React edit mode for angular panels progress 2018-11-16 08:31:29 +01:00
Torkel Ödegaard 4822c02534 Merge pull request #14092 from cloudshapes/record-full-url-in-google-analytics
Update google analytics code to submit full URL not just path
2018-11-16 07:58:55 +01:00
Torkel Ödegaard ad3e683739 Merge branch 'develop' into panel-edit-in-react 2018-11-16 07:43:37 +01:00
Torkel Ödegaard e21a140fcc minor fixes 2018-11-16 07:41:40 +01:00
Torkel Ödegaard c4ae05c5e5 Merge pull request #14078 from grafana/12759-description-n-links
12759 React-panel: description and links
2018-11-16 06:57:42 +01:00
Torkel Ödegaard 905ef22075 fixed order of time range tab 2018-11-16 06:53:54 +01:00
Patrick Schuster 481dcb321d Update ReadMe. 2018-11-16 00:30:51 +01:00
Roland Dunn 242ceb6d95 Update google analytics code to submit full URL not just path 2018-11-15 20:12:48 +00:00
Marcus Efraimsson 18810ca77f devenv: elasticsearch datasources and dashboards 2018-11-15 19:07:38 +01:00
Marcus Efraimsson 9a8ad70013 fix pipeline aggregations on doc count 2018-11-15 19:06:47 +01:00
Marcus Efraimsson cbd4125e69 changelog: add notes about closing #5930
[skip ci]
2018-11-15 17:50:18 +01:00
Marcus Efraimsson 0810aa2e60 Merge pull request #12371 from marefr/xaxis_thresholds
Time regions support in graph panel
2018-11-15 08:46:39 -08:00
David fe45cb9aa1 Merge pull request #14032 from grafana/davkal/explore-prevent-term-completion
Explore: Don't suggest term items when text follows
2018-11-15 16:43:15 +00:00
Torkel Ödegaard 8ce1cc2d52 fixed alert tab order and fixed some console logging issues 2018-11-15 17:33:55 +01:00
Marcus Efraimsson 3b4a224a57 Add tooltip 2018-11-15 17:25:58 +01:00
Peter Holmberg 61a704a64e some progress on groups and options 2018-11-15 17:14:43 +01:00
Marcus Efraimsson a8e6b241d6 changed time region color modes 2018-11-15 17:07:42 +01:00
Torkel Ödegaard a87035312d Merge branch 'develop' into panel-edit-in-react 2018-11-15 17:04:00 +01:00
Torkel Ödegaard 03040159ca Merge branch 'master' into develop 2018-11-15 17:00:03 +01:00
Torkel Ödegaard f5b63fc65d Merge branch 'master' into develop 2018-11-15 16:56:21 +01:00
Johannes Schill 83073dea2f panel-header: Move the corner information in the panel header to its own component 2018-11-15 16:52:39 +01:00
Marcus Efraimsson 36ff94668c changelog: add notes about closing #12550
[skip ci]
2018-11-15 16:38:11 +01:00
Marcus Efraimsson f560c3297e Merge pull request #14034 from grafana/12550_team_preferences
Team preferences support
2018-11-15 07:35:10 -08:00
Marcus Efraimsson 48905a613d fix pending alert annotation tooltip icon 2018-11-15 16:29:58 +01:00
bergquist caec36e7ec alert rule have to be pending before alerting is for is specified 2018-11-15 15:37:46 +01:00
Marcus Efraimsson 52a71596eb fix selected home dashboard should show as selected even though its not starred 2018-11-15 14:43:50 +01:00
Leonard Gram 2e8c4699b0 build: internal metrics for packaging. 2018-11-15 14:42:09 +01:00
Johannes Schill 0fa8ae4fac panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-15 14:30:59 +01:00
bergquist 7ba04466a2 alerting: improve annotations for pending state 2018-11-15 14:30:36 +01:00
Marcus Efraimsson 9606491f6c reload browser after preferences been updated 2018-11-15 14:29:14 +01:00
Johannes Schill e979ed140e panel-header: Unmount popper when not needed. 2018-11-15 14:16:26 +01:00
Marcus Efraimsson b8539570d0 fix snapshot tests 2018-11-15 14:16:17 +01:00
Johannes Schill 9e9ce80740 panel-header: Updated snapshots for popper 2018-11-15 13:49:48 +01:00
Johannes Schill 2a5f7d1e05 panel-header: Add fade in transition to tooltip 2018-11-15 13:44:15 +01:00
Torkel Ödegaard cf0db51659 Trying to reduce the amount of duplication with preferences 2018-11-15 13:37:29 +01:00
Erik Sundell 69137e6774 stackdriver: revert project test stuff 2018-11-15 13:23:42 +01:00
Erik Sundell b9d5fa1b36 stackdriver: revert test code 2018-11-15 13:20:32 +01:00
Johannes Schill e73466a80d panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-15 12:47:32 +01:00
bergquist e7260d77b3 adds pending filter for alert list page 2018-11-15 12:46:28 +01:00
bergquist 968bfd0139 adds pending state to alert list panel 2018-11-15 12:42:47 +01:00
bergquist a70ea2101c alertmanager: adds tests for should notify 2018-11-15 12:36:11 +01:00
David Kaltschmidt ce59acd141 Extracted language provider variables for readibility 2018-11-15 11:20:27 +00:00
Marcus Efraimsson 21e47d76d0 Merge pull request #14081 from grafana/filter-alpha-plugins
filter out alpha plugins in plugins api
2018-11-15 02:35:28 -08:00
Marcus Efraimsson bd6dc01e6b devenv: graph time regions test dashboard 2018-11-15 11:32:27 +01:00
Marcus Efraimsson 116e367e71 fix time regions mutable bug 2018-11-15 11:30:49 +01:00
Torkel Ödegaard 2ff58d5241 Merge branch 'master' into 12550_team_preferences 2018-11-15 11:29:36 +01:00
Marcus Efraimsson 81efc00adf set default color mode 2018-11-15 11:21:30 +01:00
Torkel Ödegaard 480da34279 filter out alpha plugins in api call, fixes #14030 2018-11-15 11:10:47 +01:00
bergquist 28029ce4a7 alerting: support for on execution errors and notdata 2018-11-15 11:04:16 +01:00
Torkel Ödegaard 911646f913 poc: handling panel edit mode in react even for angular panels poc 2018-11-15 09:46:21 +01:00
Johannes Schill 0430bb47c2 panel-header: Simplify condition 2018-11-15 09:17:39 +01:00
Torkel Ödegaard 487fd12d66 wip: minor update 2018-11-15 07:33:59 +01:00
Torkel Ödegaard bdf598ccb2 minor fix 2018-11-14 21:38:53 -08:00
Torkel Ödegaard 810e256787 css update to switch slider 2018-11-14 21:35:02 -08:00
bergquist 84eb3bd095 tests for supporting for with all alerting scenarios 2018-11-14 23:43:09 +01:00
bergquist 8fb997d935 should not notify when going from unknown to pending 2018-11-14 23:43:09 +01:00
Bob Shannon dcc48860b8 Fix formatting and remove enabled toggle 2018-11-14 17:37:32 -05:00
Johannes Schill 0a5f920bf5 panel-header: Avoid undefined classNames and use the real panel description 2018-11-14 22:29:10 +01:00
Torkel Ödegaard bae4c8d2e6 wip: switch slider test 2018-11-14 13:29:09 -08:00
Johannes Schill af859b2f4d panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing 2018-11-14 22:28:00 +01:00
Johannes Schill 6cd5bca9ab panel-header: Bump @types/react, @types/react-dom, react, react-dom, react-popper to latest versions 2018-11-14 22:28:00 +01:00
Bob Shannon 362b3740ed Add basic authentication support to metrics endpoint 2018-11-14 16:27:41 -05:00
Johannes Schill e20eea978a panel-header: Display description in modal 2018-11-14 22:18:48 +01:00
Torkel Ödegaard 330a5c6496 minor panel options type fix 2018-11-14 12:03:05 -08:00
Marcus Efraimsson dea953003c docs: description about graph panel time regions feature 2018-11-14 18:47:35 +01:00
Marcus Efraimsson b47a4954c9 Merge pull request #14074 from stop-cran/feature/14072
elasticsearch: do not set a placeholder to index name, if it's already specified
2018-11-14 09:21:15 -08:00
Marcus Efraimsson 0cba6da2b0 update changelog
[skip ci]
2018-11-14 18:16:41 +01:00
Marcus Efraimsson 75bc9b315d changelog: add notes about closing #11977
[skip ci]
2018-11-14 18:15:02 +01:00
Marcus Efraimsson 2ae3b97299 changelog: add notes about closing #6367
[skip ci]
2018-11-14 18:12:46 +01:00
Marcus Efraimsson 33469ecfab docs: team http api update 2018-11-14 17:59:32 +01:00
Torkel Ödegaard 159c5cdb63 wip: adding general tab for react panel edit mode 2018-11-14 17:57:37 +01:00
stop-cran 20214b3d6a [elasticsearch] Do not set a placeholder to index name, if it's already specified. 2018-11-14 18:45:18 +02:00
Marcus Efraimsson 2f65b06135 devenv: graph time regions test dashboard 2018-11-14 17:22:34 +01:00
Marcus Efraimsson 0f57c4b20e create time regions solely based on utc time 2018-11-14 17:21:20 +01:00
Peter Holmberg 063a1acf94 started on options and groups 2018-11-14 17:00:26 +01:00
Torkel Ödegaard 0a080149ae Merge pull request #14054 from marefr/6367_raw_document_reset
Fix switching from es raw document metric breaks query editor
2018-11-14 16:46:47 +01:00
Torkel Ödegaard fade3c47ca Merge pull request #14071 from grafana/react-panels-query-editor-fixes
React panels query editor fixes
2018-11-14 16:37:50 +01:00
Torkel Ödegaard c0197bcb15 fix: added events to MetricsTabCtrl to closer mimic MetricsPanelCtrl 2018-11-14 16:04:34 +01:00
David 19b3578bdd Merge pull request #14048 from grafana/davkal/explore-table-pagination-styles
Explore: Fix table pagination styles
2018-11-14 14:45:51 +00:00
David f00f347099 Merge pull request #14033 from grafana/davkal/explore-slow-ds-load
Explore: Dont set datasource in state if navigated away
2018-11-14 14:45:35 +00:00
Torkel Ödegaard ebc5b3e693 minor css change 2018-11-14 15:17:28 +01:00
Torkel Ödegaard 18308bf584 Merge pull request #14069 from grafana/panel-focus-in-react
Panel focus in react
2018-11-14 14:40:18 +01:00
Torkel Ödegaard 1eecda48f8 Moved query manipulations from metrics controller to metrics tab so they are more easily shared between angular and react panels 2018-11-14 14:40:03 +01:00
Torkel Ödegaard 888eb9d94c fixed panel focus for react panels 2018-11-14 13:31:40 +01:00
Torkel Ödegaard 3ce7197c8e Merge pull request #14067 from grafana/react-panels-minor-changes
minor changes to react panels
2018-11-14 13:30:45 +01:00
Torkel Ödegaard 080d611004 minor changes to react panels 2018-11-14 13:20:19 +01:00
Torkel Ödegaard 604add078b Merge pull request #14066 from grafana/panel-size-refactor
Panel size refactor
2018-11-14 12:38:21 +01:00
Torkel Ödegaard 6d65432c8a Merge branch 'toggle-panel-menu-withreact' into develop 2018-11-14 12:24:30 +01:00
Torkel Ödegaard 90c41bb087 changed how size is calcualted and propagated and added proper interval calc to DataPanel 2018-11-14 12:03:25 +01:00
bergquist aa340b9099 changelog: adds note about closing #14043 2018-11-14 11:30:19 +01:00
Peter Holmberg e4e41474b1 first stuff 2018-11-14 11:06:02 +01:00
Mario Trangoni 774ad3ff39 pkg/cmd/grafana-server/server.go: Check sendSystemdNotification return value.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
server.go:165:25⚠️ error return value not checked (sendSystemdNotification("READY=1")) (errcheck)
2018-11-13 21:21:18 +01:00
Mario Trangoni dae7c11a5f pkg/cmd/grafana-server/server.go: check serviceGraph.Provide() errors
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/server.go:77:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: bus.GetBus()})) (errcheck)
pkg/cmd/grafana-server/server.go:78:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g.cfg})) (errcheck)
pkg/cmd/grafana-server/server.go:79:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: routing.NewRouteRegister(middleware.RequestMetrics, middleware.RequestTracing)})) (errcheck)
pkg/cmd/grafana-server/server.go:80:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: cache.New(5*time.Minute, 10*time.Minute)})) (errcheck)
pkg/cmd/grafana-server/server.go:87:23⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: service.Instance})) (errcheck)
pkg/cmd/grafana-server/server.go:90:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g})) (errcheck)
2018-11-13 20:02:55 +01:00
Mario Trangoni a6d54d5d9f pkg/cmd/grafana-server/main.go: Fix error value not checked
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/main.go:56:23⚠️ error return value not checked (http.ListenAndServe(fmt.Sprintf("localhost:%d", *profilePort), nil)) (errcheck)
2018-11-13 19:51:32 +01:00
Torkel Ödegaard dedeaf541e wip panel size handling 2018-11-13 18:50:12 +01:00
Peter Holmberg 655f4d0a8d fixed issue with save. 2018-11-13 18:23:35 +01:00
Peter Holmberg 03cf238fa7 fixed mutability issue in dashboard dropdowns 2018-11-13 18:23:00 +01:00
Torkel Ödegaard 8ad37ea926 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-11-13 17:25:11 +01:00
Torkel Ödegaard b530b9ce7f Merge branch 'master' into develop 2018-11-13 17:24:51 +01:00
Torkel Ödegaard f50dc4e99d Merge pull request #14053 from grafana/singlestat-fix
fixed singlestat guage ceneterd dot rendering issue
2018-11-13 17:23:46 +01:00
Peter Holmberg a9b5cbf381 adced clickoutside wrapper 2018-11-13 17:00:28 +01:00
Torkel Ödegaard b5921ef287 fixed singlestat guage ceneterd dot rendering issue 2018-11-13 16:51:33 +01:00
Torkel Ödegaard 2c6963fc6f Merge branch 'master' of github.com:grafana/grafana into develop 2018-11-13 16:26:46 +01:00
Torkel Ödegaard 51a95963f3 Merge pull request #14020 from grafana/12759-timeshift
12759 timeshift and panelTimeOverrides
2018-11-13 16:26:30 +01:00
Torkel Ödegaard 6d91e06f4d refactoring back the interval calculation, needs to be different for react panels 2018-11-13 16:01:52 +01:00
Torkel Ödegaard f026be3790 fix case where timeshift and time override is used 2018-11-13 15:23:13 +01:00
Torkel Ödegaard f274195d81 wip: refactoring interval and time override handling 2018-11-13 15:05:07 +01:00
Carl Bergquist 81a5b90022 Merge pull request #14043 from bergquist/upgrade_macaron_session
Upgrades the go-macaroon package
2018-11-13 14:42:06 +01:00
bergquist a0496d554a updates latest to 5.3.4 2018-11-13 14:04:28 +01:00
bergquist 3a672c6dc2 changelod: add release date for 5.3.3 and 5.3.4 2018-11-13 13:58:35 +01:00
Marcus Efraimsson e8e189d111 devenv: graph time regions test dashboard 2018-11-13 12:39:10 +01:00
Marcus Efraimsson 63be43e3b2 graph: Time region support 2018-11-13 12:23:06 +01:00
David Kaltschmidt 7627de80f2 Explore: Fix table pagination styles
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
2018-11-13 11:00:32 +00:00
Marcus Efraimsson 1958de7220 devenv: update alerting with testdata dashboard 2018-11-13 11:51:06 +01:00
Erik Sundell 2e0cbe75ee stackdriver: use arrow functions 2018-11-13 11:06:08 +01:00
Erik Sundell e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +01:00
Marcus Efraimsson aa47f80fd8 Merge pull request #14042 from grafana/restore_prefs_control
Restore user profile preferences
2018-11-13 01:42:51 -08:00
bergquist 5954ab2c0d adds redis devenv block 2018-11-13 10:27:57 +01:00
Marcus Efraimsson 69a57850c4 restore user profile preferences 2018-11-13 10:22:02 +01:00
Torkel Ödegaard d49e857bc0 Merge branch 'develop' into 12759-timeshift 2018-11-13 09:56:58 +01:00
Torkel Ödegaard 700c9642db Merge pull request #14039 from grafana/minor-react-panels-refactor
minor react panels refafactor
2018-11-13 09:55:48 +01:00
Marcus Efraimsson 97c6f3560c changelog: add notes about closing #13328 #13949
[skip ci]
2018-11-13 09:44:35 +01:00
bergquist d5555f123f updates macaron session package 2018-11-13 09:41:36 +01:00
Torkel Ödegaard 81a9a3a3c1 Merge branch 'develop' into 12759-timeshift 2018-11-13 08:51:48 +01:00
Torkel Ödegaard 7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard 6b2a47f2af Merge pull request #14038 from grafana/plugin-not-found
Plugin not found
2018-11-13 08:25:47 +01:00
Torkel Ödegaard e331d24a38 removed console.log 2018-11-13 08:11:03 +01:00
Torkel Ödegaard 9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard 9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Torkel Ödegaard 68eecf6ca6 Merge pull request #14037 from matschaffer/patch-2
Clarify wording of playlist protip
2018-11-13 07:04:27 +01:00
Mat Schaffer f6313fe675 Clarify wording of playlist protip
Per discussion on https://github.com/grafana/grafana/commit/154fbe2413f9abe33157baa563e42fbf67e2f27b#r31238888 it seemed like this wording might be easier to understand.
2018-11-13 14:56:32 +09:00
Marcus Efraimsson 1194ff282e team preferences ui 2018-11-12 20:58:59 +01:00
Marcus Efraimsson 5f9fecd254 feat: team preferences 2018-11-12 20:01:53 +01:00
David Kaltschmidt 9b48338d95 Explore: Dont set datasource in state if navigated away
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
2018-11-12 18:06:12 +00:00
David Kaltschmidt ff0ed06441 Explore: Don't suggest term items when text follows
Tab completion gets in the way when constructing a query from the inside
out:

```
up| => |up => sum(|up)
```

At that point the language provider will not suggest anything.
2018-11-12 17:40:05 +00:00
Torkel Ödegaard 119e94f745 wip: panel plugin not found 2018-11-12 17:54:44 +01:00
Torkel Ödegaard 7a30220d01 fixed scrollbar autohide prop 2018-11-12 17:48:10 +01:00
Torkel Ödegaard 727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Torkel Ödegaard a2a4458923 Merge pull request #14023 from grafana/gauge-panel
React Gauge Panel - first step
2018-11-12 15:58:54 +01:00
Johannes Schill 6d4d7c5032 wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state 2018-11-12 11:38:41 +01:00
Johannes Schill e045169094 wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg 2018-11-12 11:31:33 +01:00
Johannes Schill a3f1a1c6b3 wip: panel-header: Remove the TimeData type 2018-11-12 11:31:33 +01:00
Johannes Schill 8117a7559f wip: panel-header: Add proper typings to maxDataPoints and interval + remove code in comment 2018-11-12 11:31:33 +01:00
Johannes Schill e55f3f883f wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular 2018-11-12 11:31:33 +01:00
Johannes Schill 9fd62b80d9 wip: panel-header: Start implementing the applyPanelTimeOverrides in the react panels by moving it to a util, make it pure and call it from angular and react. 2018-11-12 11:31:33 +01:00
Peter Holmberg 490fb9e8e6 import changes 2018-11-12 11:25:47 +01:00
Carl Bergquist fdbea75775 Merge pull request #14021 from mjtrangoni/fix-gofmt-issues
Fix gofmt issues
2018-11-12 11:22:12 +01:00
Peter Holmberg 9f1784d0e5 updated text styling when switching views 2018-11-12 10:59:35 +01:00
Mario Trangoni 89cd74715e Add gofmt -s to CircleCI 2018-11-12 10:51:43 +01:00
bergquist 2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
Mario Trangoni 8c04926326 Fix gofmt issues
See,
$ gometalinter --disable-all --enable=gofmt --deadline 10m --vendor ./...
build.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/externalrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/localrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/main.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/publisher_test.go:1:⚠️ file is not gofmted with -s (gofmt)
2018-11-12 10:47:27 +01:00
Athurg Feng 919d00437e Add pic into actionCard message 2018-11-12 11:18:53 +08:00
Torkel Ödegaard 46ebe245ab Merge pull request #13999 from roidelapluie/originreferer
Remove Origin and Referer while proxying requests
2018-11-11 17:49:15 +01:00
Torkel Ödegaard a0620ac8f6 minor style fixes & polish 2018-11-11 17:46:40 +01:00
Torkel Ödegaard 057696a0f8 Merge pull request #14002 from Nexucis/bugfix/template-srv
[Bugfix] Don't drop the value when it's equal to None
2018-11-11 16:49:51 +01:00
Carl Bergquist 733f2b066a Merge pull request #14012 from mjtrangoni/fix-megacheck-issues
Fix last megacheck issues
2018-11-11 11:22:26 +01:00
Torkel Ödegaard 2aef5fbc3b minor update 2018-11-10 12:17:40 -08:00
Torkel Ödegaard 02cbb4076e disable custom webkit scrollbar styles 2018-11-10 17:38:12 +01:00
Torkel Ödegaard c4ad069083 refactoring & cleaning up css 2018-11-10 17:28:28 +01:00
Torkel Ödegaard f74f7b017f Minor progress on edit mode 2018-11-10 07:34:09 -08:00
ryan 594051b3fb Merge remote-tracking branch 'grafana/master'
* grafana/master: (116 commits)
  Adjust UI depth of query statistics
  Preserve suffix text when applying function suggestion
  changelog: adds note about closing #13993
  Refactored log stream merging, added types, tests, comments
  Fixes #13993 - adds more options for Slack notifications
  add auth.proxy headers to sample.ini
  add auth.proxy headers to default.ini
  fixed issue with reducer sharing url query instance with angular router
  fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891
  minor text change in export modal
  build: removes unused.
  Fixed issues introduced by changing to PureComponent
  further refactoring of #13984
  minor fix
  refactorings and some clean-up / removal of things not used
  Update docs/sources/permissions/dashboard_folder_permissions.md
  Fix typo in docs/sources/reference/scripting.md
  move enterprise down in menu
  wip: panel-header: Fix shareModal compatibility with react and angular
  wip: panel-header: Remove custom menu items from panels completely
  ...
2018-11-09 12:28:29 -08:00
Torkel Ödegaard c54ae5d124 improve dropdown pane connetion to tab toolbar 2018-11-09 11:33:33 -08:00
Mario Trangoni a2275e8a1c Add megacheck to gometalinter CircleCI target
See, https://github.com/dominikh/go-tools/tree/master/cmd/megacheck
2018-11-09 19:46:40 +01:00
Mario Trangoni e351e6e211 pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/influxdb/influxdb.go:106:3⚠️ the surrounding loop is unconditionally terminated (SA4004) (megacheck)
2018-11-09 19:40:07 +01:00
Mario Trangoni 960651e510 scripts/build/release_publisher/publisher_test.go: Fix trivial megacheck warning.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
scripts/build/release_publisher/publisher_test.go:14:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-11-09 19:36:14 +01:00
Peter Holmberg 656900516b draw gauge 2018-11-09 16:37:09 +01:00
Torkel Ödegaard 1bad8db94c data source picker demo state 2018-11-09 15:50:09 +01:00
David 0e7b6dcfb4 Merge pull request #14008 from miqh/fix/query-stats-depth
Adjust UI depth of query statistics
2018-11-09 15:06:17 +01:00
David 502b3c390d Merge pull request #13954 from miqh/fix/apply-function-suggestion
Preserve suffix text when applying function suggestion
2018-11-09 14:56:25 +01:00
Erik Sundell 30f9a324ac stackdriver: remove service query tyhpe 2018-11-09 14:36:50 +01:00
Erik Sundell 3b9eda2561 stackdriver: correct aligner name 2018-11-09 14:36:04 +01:00
Peter Holmberg 9163db02b4 fix in to not render multiple labels 2018-11-09 14:32:14 +01:00
Erik Sundell f307fc4760 stackdriver: typescriptifying props 2018-11-09 14:30:28 +01:00
Erik Sundell 75da02e1f0 Merge branch 'stackdriver-template-query-editor' of https://github.com/grafana/grafana into stackdriver-template-query-editor 2018-11-09 14:28:05 +01:00
Erik Sundell 996b470dd0 stackdriver: remove redundant try catch 2018-11-09 14:24:21 +01:00
Erik Sundell 33411198ab Update stackdriver.md 2018-11-09 14:19:41 +01:00
Michael Huynh 5d9faef167 Adjust UI depth of query statistics
A z-index value of less than 1020 is needed because the time selection
dropdown shares the latter value via inheritance. Arbitrarily picked
1015 because it is a notch down.

Related: #14004
2018-11-09 21:09:22 +08:00
Erik Sundell bb1f79ecdc stackdriver: rename query function 2018-11-09 13:55:16 +01:00
Erik Sundell 5424603052 stackdriver: rename query variable 2018-11-09 13:55:16 +01:00
Erik Sundell f14b3e7fcf stackdriver: remove debug log 2018-11-09 13:55:16 +01:00
Erik Sundell bdaa61a193 stackdriver: add documentation for the template query editor 2018-11-09 13:55:16 +01:00
Erik Sundell 9c85793dbb stackdriver: test saved variable 2018-11-09 13:55:15 +01:00
Erik Sundell b262be73e0 stackdriver: fix failing tests 2018-11-09 13:55:15 +01:00
Erik Sundell 45f49c2e5b stackdriver: remove services query type 2018-11-09 13:55:15 +01:00
Erik Sundell 209b1c026e stackdriver: update tests 2018-11-09 13:55:15 +01:00
Erik Sundell 0280179d35 stackdriver: add tests for render snapshop and default query type 2018-11-09 13:55:15 +01:00
Erik Sundell 7bdf97d3e6 stackdriver: remove lodash since object assign will do the trick 2018-11-09 13:55:15 +01:00
Erik Sundell 85ef5c2523 stackdriver: make sure we don't crash when selected service doesnt have a value 2018-11-09 13:55:15 +01:00
Erik Sundell 8333bf0b76 stackdriver: add simple render test 2018-11-09 13:55:15 +01:00
Erik Sundell 24cb44e029 stackdriver: rename params 2018-11-09 13:55:15 +01:00
Erik Sundell f168dd5d34 stackdriver: remove not used prop 2018-11-09 13:55:14 +01:00
Erik Sundell 1fe70721c9 stackdriver: persist template variable definition 2018-11-09 13:55:14 +01:00
Erik Sundell 2d14bd10f3 stackdriver: add default value for query type 2018-11-09 13:55:14 +01:00
Erik Sundell 588c5c045a stackdriver: pass query definition from react, making it possible to use another definition than the query string only 2018-11-09 13:55:14 +01:00
Erik Sundell 5069f4afc9 stackdriver: make it possible to use alignment period template variable 2018-11-09 13:55:14 +01:00
Erik Sundell a027a87d50 stackdriver: make it possible to use aligner template variable 2018-11-09 13:55:14 +01:00
Erik Sundell 2a6aec721e stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell a951e577b7 stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell 20f1956225 stackdriver: make it possible to use metric type template variable 2018-11-09 13:55:13 +01:00
Erik Sundell 4569527873 stackdriver: set currentdatasource when editview is enabled 2018-11-09 13:55:13 +01:00
Erik Sundell 40bb3551cf stackdriver: return correct value 2018-11-09 13:55:13 +01:00
Erik Sundell 3883643ea2 stackdriver: reset query value on datasource changed 2018-11-09 13:55:13 +01:00
Erik Sundell fcf39a0839 stackdriver: fix default value bug 2018-11-09 13:55:13 +01:00
Erik Sundell 042d156e5f stackdriver: extend label width 2018-11-09 13:55:13 +01:00
Erik Sundell 21940c2ca3 stackdriver: revert refactoring 2018-11-09 13:55:12 +01:00
Erik Sundell 2780ef27fd stackdriver: extract variables for pickers 2018-11-09 13:55:12 +01:00
Erik Sundell b3c34be648 stackdriver: cleanup 2018-11-09 13:55:12 +01:00
Erik Sundell a46b9cb0bb stackriver: rename interface 2018-11-09 13:55:12 +01:00
Erik Sundell e9e20224d4 stackriver: use type for state 2018-11-09 13:55:12 +01:00
Erik Sundell e0c0dc1453 stackdriver: rename state vars 2018-11-09 13:55:12 +01:00
Erik Sundell 9872ea7d8c stackdriver: extract common function 2018-11-09 13:55:11 +01:00
Erik Sundell c993a4d296 stackdriver: streamline the way labels are refreshed when a new value is picked in the dropdowns above 2018-11-09 13:55:11 +01:00
Erik Sundell 1791e7329c stackdriver: handle default state 2018-11-09 13:55:11 +01:00
Erik Sundell 3c5f8325f5 stackdriver: refactor dropdown component 2018-11-09 13:55:11 +01:00
Erik Sundell 3c1cf214bc stackdriver: replace components with basic stateless select 2018-11-09 13:55:11 +01:00
Erik Sundell 1194da0d04 stackdriver: remove not used func. wrap query in exception 2018-11-09 13:55:11 +01:00
Erik Sundell 3af1d74c6a stackdriver: reload all child dropdown and update selected accordingly 2018-11-09 13:55:10 +01:00
Erik Sundell c40794c2b9 stackdriver: improve default state handling 2018-11-09 13:55:10 +01:00
Erik Sundell 16c6d79dd6 stackdriver: use standard naming convention for selects 2018-11-09 13:55:10 +01:00
Erik Sundell d80025d215 stackdriver: streamline label change 2018-11-09 13:55:10 +01:00
Erik Sundell 727472a3cb stackdriver: refactor TemplateQueryComponent 2018-11-09 13:55:10 +01:00
Erik Sundell f0b4af9f6c stackdriver: use enum for query type 2018-11-09 13:55:10 +01:00
Erik Sundell ca77cdc37e stackdriver: add aggregation query 2018-11-09 13:55:09 +01:00
Erik Sundell b1db07789b stackdriver: add alignment periods 2018-11-09 13:55:09 +01:00
Erik Sundell a0b8c4acba stackdriver: add aligner query 2018-11-09 13:55:09 +01:00
Erik Sundell b3edad40a9 stackdriver: add resource types query 2018-11-09 13:55:09 +01:00
Erik Sundell cb0d563aae stackdriver: add support for resource label queries 2018-11-09 13:55:09 +01:00
Erik Sundell 8c3874ee30 stackdriver: return friendly display name 2018-11-09 13:55:08 +01:00
Erik Sundell 4ab278dca4 stackdriver: add metric labels query 2018-11-09 13:55:08 +01:00
Erik Sundell cbb663015e stackdriver: move response parsing to datasource file 2018-11-09 13:55:08 +01:00
Erik Sundell 7ccce76b80 stackdriver: return values for services and metric types 2018-11-09 13:55:08 +01:00
Erik Sundell f0cba0b0d8 stackdriver: rename default component 2018-11-09 13:55:08 +01:00
Erik Sundell 149c649132 stackdriver: more renaming 2018-11-09 13:55:08 +01:00
Erik Sundell 33c9217cc9 stackdriver: refactoring - rename react components and file structure changes 2018-11-09 13:55:08 +01:00
Erik Sundell 4bcf3bf1ff stackdriver: remove not used code 2018-11-09 13:53:44 +01:00
Erik Sundell ba4d52e048 stackdriver: add selector components for service and metric type 2018-11-09 13:53:44 +01:00
Erik Sundell 1969ad41e8 stackdriver: refactor stackdriver query ctrl 2018-11-09 13:53:44 +01:00
Erik Sundell 4f7d3fccb7 stackdriver: make sure default template query editor state is propagted to parent angular scope 2018-11-09 13:53:44 +01:00
Erik Sundell 637b91ab8d stackdriver: conditional template component rendering 2018-11-09 13:53:44 +01:00
Erik Sundell 0792c182cc stackdriver: add react component for template query editor 2018-11-09 13:53:44 +01:00
Erik Sundell 94ac522109 stackdriver: make it possible to load react plugin components from template query page 2018-11-09 13:53:43 +01:00
Erik Sundell efd3343d19 stackdriver: add basic directive for loading react plugin components 2018-11-09 13:51:37 +01:00
Michael Huynh 22b8b04dbe Preserve suffix text when applying function suggestion
Updates all PromQL function-like suggestions to omit parentheses
when inserted. Such insertions also preserve any suffix text.

Related: #13885
2018-11-09 20:43:20 +08:00
Torkel Ödegaard a7daf58bb9 wip: progress on edit mode ux with tabs 2018-11-09 13:17:41 +01:00
Peter Holmberg b536a9f760 can render something 2018-11-08 16:40:53 +01:00
Augustin Husson 2abf8a0e8b don't drop the value when it equals to None 2018-11-08 16:23:40 +01:00
bergquist 16bf269c31 changelog: adds note about closing #13993
[skip ci]
2018-11-08 15:04:16 +01:00
Carl Bergquist a8b8af9742 Merge pull request #13994 from andreykaipov/feature/more-slack-alerting-options
Adds more options for Slack notifications
2018-11-08 14:59:56 +01:00
Julien Pivotto 62417ca69f Remove Origin and Referer headers while proxying requests
Fix #13949
Fix #13328

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-11-08 14:57:47 +01:00
David 203078280f Merge pull request #13942 from grafana/davkal/explore-logging-graph
Explore: Logging graph overview and view options
2018-11-08 14:38:29 +01:00
David Kaltschmidt 6b8d7c89ac Refactored log stream merging, added types, tests, comments 2018-11-08 14:24:54 +01:00
bergquist aa1b80fe45 docs: improve helper test for For 2018-11-08 14:16:58 +01:00
bergquist 975f0aa064 alerting: adds docs about the for setting 2018-11-08 13:52:06 +01:00
Torkel Ödegaard 8a9d721c00 panel-edit-ux-tabs on top alternative 2018-11-08 12:25:22 +01:00
Torkel Ödegaard 964a21b091 Merge branch 'master' into panel-edit-ux 2018-11-08 11:46:04 +01:00
Athurg Feng b7787db34e Add new option to set where to open the message url 2018-11-08 18:44:00 +08:00
Marcus Efraimsson 662808f092 Merge pull request #13930 from grafana/enterprise-docs
docs: restructure and enhancement
2018-11-08 01:50:35 -08:00
Peter Holmberg 7799ad8108 added loading state 2018-11-08 09:34:14 +01:00
Torkel Ödegaard 7de07eb096 Merge pull request #13992 from grafana/auth_proxy_headers_default
add auth.proxy headers to default.ini
2018-11-08 08:57:33 +01:00
Andrey Kaipov 63fdffe8c0 Fixes #13993 - adds more options for Slack notifications 2018-11-07 22:08:26 -05:00
Marcus Efraimsson f065af320d fix switching from es raw document metric breaks query editor 2018-11-08 01:00:20 +01:00
Dan Cech 8a74fe2b76 add auth.proxy headers to sample.ini 2018-11-07 18:21:25 -05:00
Torkel Ödegaard 3b4d8c9b9b Merge pull request #13984 from grafana/12759-panel-header-standard-menu-only
12759 panel header menu in React (standard options only)
2018-11-07 23:42:42 +01:00
Dan Cech 502290817a add auth.proxy headers to default.ini 2018-11-07 17:36:44 -05:00
Torkel Ödegaard 29e18fddd0 refactored how testing state was handled, using redux for this felt way to require way to much code 2018-11-07 14:28:44 -08:00
bergquist 0ddfd92f8c adds debounce duration for alert dashboards in ha_test 2018-11-07 22:30:23 +01:00
Torkel Ödegaard 8ff6bb07bc Merge branch 'data-source-settings-to-react' of github.com:grafana/grafana into data-source-settings-to-react 2018-11-07 11:51:02 -08:00
Torkel Ödegaard dcb5015022 Merge pull request #13951 from marefr/11977_6x_terms
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
Torkel Ödegaard d7655e0b54 fixed issue with reducer sharing url query instance with angular router 2018-11-07 11:44:50 -08:00
Torkel Ödegaard 4e49c453b9 Merge pull request #13990 from grafana/exporter-fix-13891
Exporter bug fix
2018-11-07 20:33:22 +01:00
Torkel Ödegaard bcd0b2fcf7 Merge branch 'master' into 12759-panel-header-standard-menu-only 2018-11-07 11:22:30 -08:00
Torkel Ödegaard 99610e040f fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891 2018-11-07 11:14:39 -08:00
Torkel Ödegaard 0712c52cbc Merge branch 'bergquist-export_dashboard_guidence' 2018-11-07 11:13:22 -08:00
Torkel Ödegaard c52e91ee6c minor text change in export modal 2018-11-07 10:46:09 -08:00
Torkel Ödegaard e73e18913c Merge branch 'export_dashboard_guidence' of https://github.com/bergquist/grafana into bergquist-export_dashboard_guidence 2018-11-07 10:34:15 -08:00
Torkel Ödegaard 0353c9ea9f Merge pull request #13988 from xlson/removes_old_ci
build: removes unused.
2018-11-07 19:32:34 +01:00
Leonard Gram d88693fd6d build: removes unused. 2018-11-07 17:03:24 +01:00
Peter Holmberg 682697e2cd clear test box if success 2018-11-07 16:14:55 +01:00
Torkel Ödegaard 93b4cb562d Fixed issues introduced by changing to PureComponent 2018-11-07 16:03:33 +01:00
Peter Holmberg b7d494551c Added testing state in reducer 2018-11-07 15:38:53 +01:00
Torkel Ödegaard 37eb7ca62b further refactoring of #13984 2018-11-07 13:55:02 +01:00
Marcus Efraimsson d7edc59882 minor fix 2018-11-07 13:52:11 +01:00
Torkel Ödegaard a24f6998f2 refactorings and some clean-up / removal of things not used 2018-11-07 13:36:35 +01:00
Marcus Efraimsson 454d74a176 Merge pull request #13982 from grafana/adeverteuil-patch-1
Fix typo in docs/sources/reference/scripting.md
2018-11-07 03:49:43 -08:00
Peter Holmberg e25b2d0ab6 Merge branch 'master' into data-source-settings-to-react 2018-11-07 09:50:17 +01:00
Alexandre de Verteuil d0794dbce1 Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-07 09:17:36 +01:00
Alexandre de Verteuil 1d3b8e25ce Fix typo in docs/sources/reference/scripting.md
Change:
> In the folder grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
…to:
> In the grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
2018-11-06 15:41:37 -05:00
Torkel Ödegaard 7d87f57367 experimental option boxes 2018-11-06 18:55:35 +01:00
Torkel Ödegaard 5975c4a737 ux: changed panel selection ux 2018-11-06 18:34:37 +01:00
Marcus Efraimsson f294dbdb86 move enterprise down in menu 2018-11-06 17:39:35 +01:00
Johannes Schill 08251425ca wip: panel-header: Fix shareModal compatibility with react and angular 2018-11-06 16:55:44 +01:00
Johannes Schill 9c28ff8f84 wip: panel-header: Remove custom menu items from panels completely 2018-11-06 16:44:13 +01:00
Johannes Schill dd7437e9e9 wip: panel-header: Reverted a lot of code to pause the "custom menu options" for now 2018-11-06 16:37:51 +01:00
Johannes Schill 49550ccedf wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:12:04 +01:00
Johannes Schill dbf7f3fb61 wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:05:34 +01:00
Dan Cech 1347ce5f75 Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:57:14 +01:00
Dan Cech 850c0e7111 Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:53 +01:00
Dan Cech 4ef770fe98 Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:32 +01:00
Dan Cech 1bc3f0af07 Update docs/sources/http_api/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:12 +01:00
Dan Cech 8a52cb7714 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:53 +01:00
Dan Cech d44b8968d2 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:42 +01:00
Dan Cech 803b36a059 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:28 +01:00
Dan Cech 5cdd53c5e7 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:05 +01:00
Dan Cech 32e001dba4 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:53 +01:00
Dan Cech 881c73fb93 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:25 +01:00
Dan Cech 044505a213 minor change
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:53:49 +01:00
Johannes Schill 6c0c1254fe wip: panel-header: More merge conflicts 2018-11-06 15:44:04 +01:00
David Kaltschmidt dfc0c5052d Fix loglevel tests for Explore loggging 2018-11-06 15:40:29 +01:00
Johannes Schill ca4612af26 wip: panel-header: Merge conflicts 2018-11-06 15:35:15 +01:00
Johannes Schill f471482569 wip: panel-header: Fragment not needed anymore 2018-11-06 15:27:15 +01:00
Johannes Schill 443d381dd9 wip: panel-header: Add possibility to add custom actions to the menu by passing them in as props 2018-11-06 15:26:56 +01:00
Johannes Schill f124b9de6a wip: panel-header: Separate all panel actions to its own file so we decouple them from react 2018-11-06 15:26:43 +01:00
Johannes Schill 6151310216 wip: panel-header: Start implementing the Toggle legend, but its not taken all the way 2018-11-06 15:26:34 +01:00
Johannes Schill 79da3dc9f6 wip: panel-header: Change DashboardPanel to a PureComponent to avoid unwanted rerenders 2018-11-06 15:25:59 +01:00
Johannes Schill 5375ce5ffd wip: panel-header: Refactor so "Share" use the same code in angular+react 2018-11-06 15:25:46 +01:00
Johannes Schill f9dd516578 wip: panel-header: Add "Edit JSON" functionality + make sure everyone using the json editor pass in the model property instead of the scope property when triggering the json modal 2018-11-06 15:25:36 +01:00
Johannes Schill edceb204e7 wip: panel-header: Add "Copy" functionality 2018-11-06 15:25:13 +01:00
Johannes Schill b296d724e5 wip: panel-header: Add "Duplicate" 2018-11-06 15:25:07 +01:00
Johannes Schill 839057dc7a wip: Add "Share" to the react panels 2018-11-06 15:25:02 +01:00
Johannes Schill bf8703edb8 wip: panel-header: Move code existing in both angular+react to utility functions 2018-11-06 15:24:25 +01:00
Johannes Schill 820e47b4c0 wip: panel-header: Remove panel 2018-11-06 15:24:06 +01:00
Johannes Schill 212c086162 Mobx is now Redux 2018-11-06 15:24:00 +01:00
Johannes Schill 9f6683de2c wip: Initial commit for PanelHeaderMenu 2018-11-06 15:23:52 +01:00
Torkel Ödegaard b372b4323d Merge branch 'master' into panel-edit-ux 2018-11-06 15:01:16 +01:00
Marcus Efraimsson b28b79100a changelog: add notes about closing #13903
[skip ci]
2018-11-06 13:50:30 +01:00
Marcus Efraimsson a66dba1608 changelog: add notes about closing #13932
[skip ci]
2018-11-06 13:47:05 +01:00
Torkel Ödegaard b592d5d731 Merge pull request #13977 from grafana/13932_ds_selector
fix selecting datasource using enter key
2018-11-06 13:27:59 +01:00
Torkel Ödegaard eae754a0c6 Merge pull request #13971 from grafana/react-panel-options
React panel options
2018-11-06 13:16:30 +01:00
David Kaltschmidt f5575459eb unify log level colors between rows and graph 2018-11-06 12:05:10 +01:00
David Kaltschmidt a5ed86edba Graph log entries by log level 2018-11-06 12:00:05 +01:00
Marcus Efraimsson e5e886ccb7 fix selecting datasource using enter key 2018-11-06 11:49:22 +01:00
David Kaltschmidt e39e82949d Adaptive bar widths for log graph 2018-11-06 11:07:12 +01:00
Marcus Efraimsson a3196a130e changelog: add notes about closing #13970
[skip ci]
2018-11-06 10:50:32 +01:00
Leonard Gram 34f531e113 build: fixes 2018-11-06 09:52:53 +01:00
Marcus Efraimsson 2be28ff247 Merge pull request #13970 from zcoffy/master
Adding Cloudwatch AWS/Connect metrics and dimensions
2018-11-06 09:51:33 +01:00
Leonard Gram c9a4da4270 build: publisher handles nightly builds. 2018-11-06 09:41:31 +01:00
bergquist 7bde98aff9 rename and mark functions as private 2018-11-06 09:00:17 +01:00
Torkel Ödegaard 932ace299a drag handle css 2018-11-06 08:33:49 +01:00
Torkel Ödegaard b60ebf92b2 moved drag handle 2018-11-06 08:01:00 +01:00
Torkel Ödegaard 562411af1a fixed options 2018-11-06 07:23:02 +01:00
David Kaltschmidt c1ca1ed35e Time selection via graph 2018-11-05 23:36:58 +01:00
Torkel Ödegaard b9612aaa23 minor code style change 2018-11-05 10:38:55 -08:00
Torkel Ödegaard 9393b06166 basic panel options working 2018-11-05 10:31:39 -08:00
Zac Coffy 9cce0f553a Adding Cloudwatch AWS/Connect metrics and dimensions 2018-11-05 13:15:03 -05:00
Torkel Ödegaard 35e62bbbe0 wip: react panel options architecture 2018-11-05 17:46:09 +01:00
bergquist 17adb58d80 export: provide more help regarding export format
this will provide the user with more info about
the export format and default to not use the format
for sharing on grafana.com etc.

ref #13781
2018-11-05 17:33:42 +01:00
Marcus Efraimsson 26cbc6be81 Merge pull request #13966 from marefr/alert_extractor_refactor
Refactor dashboard alert extractor
2018-11-05 17:06:27 +01:00
Leonard Gram 272c43f7b7 build: minor publisher fixes. 2018-11-05 16:57:30 +01:00
Peter Holmberg ffc06e9962 extract store from configurestore 2018-11-05 16:54:48 +01:00
Leonard Gram 82b84c5906 Merge pull request #13968 from xlson/configurable-release-publisher
Configurable release publisher
2018-11-05 16:35:49 +01:00
Peter Holmberg 6dc3e0399d added actions 2018-11-05 16:33:43 +01:00
Leonard Gram 1de35c43a7 build: publishes grafana enterprise to grafana.com 2018-11-05 16:26:19 +01:00
bergquist 30e924611d changelog: adds note about closing #13322 2018-11-05 15:42:26 +01:00
Carl Bergquist 5abc884f5f Merge pull request #13964 from bergquist/alerting_deleted_folder
alerting: delete alerts when parent folder is deleted
2018-11-05 15:32:46 +01:00
Leonard Gram d728a3c521 build: publisher uses local time.
Previously the local day was used but the timestamp
was set to midnight.
2018-11-05 15:06:52 +01:00
Leonard Gram 5da9760aeb build: publisher supports both local and remote. 2018-11-05 15:06:52 +01:00
Leonard Gram d9eaec99e2 build: publisher can find artifacts from local sources. 2018-11-05 15:06:52 +01:00
Leonard Gram c5c3e08442 build: refactor releaser. 2018-11-05 15:06:51 +01:00
Leonard Gram e2d3382470 build: prepares release tool for finding local releases. 2018-11-05 15:06:51 +01:00
Leonard Gram 7e093a32a2 build: improved release publisher dry-run. 2018-11-05 15:06:51 +01:00
Leonard Gram a1dca2117d build: use build workflow id instead of build number. (#13965)
* build: use build workflow id instead of build number.

The workflow id is unique across the whole workflow
while the build number is unique to every job in the
workflow. This change means that jobs that build
artifacts for the same commit but in different jobs
will now have the same id.

* build: fixes pkgver generation.
2018-11-05 15:05:12 +01:00
bergquist 423331dae0 alerting: delete alerts when parent folder is deleted
closes #13322
2018-11-05 14:25:26 +01:00
Marcus Efraimsson 9e0da02b6a refactor dashboard alert extractor 2018-11-05 14:25:19 +01:00
bergquist 3789583014 for: use 0m as default for existing alerts and 5m for new 2018-11-05 13:51:35 +01:00
Torkel Ödegaard dd4eab1722 panel options wip 2018-11-05 13:44:09 +01:00
Peter Holmberg 52232f98b9 Exposing digest from angular component 2018-11-05 13:39:57 +01:00
bergquist ae2d536740 adds tests for extracting for property 2018-11-05 13:29:33 +01:00
Torkel Ödegaard c9802c283e minor fix 2018-11-05 12:33:40 +01:00
David 0df14f3fa8 Merge pull request #13927 from grafana/davkal/explore-start-task
Explore: fix metric selector for additional rows
2018-11-05 12:30:02 +01:00
David 24e5922d68 Merge pull request #13953 from miqh/fix/suppress-aggregation-suggestions
Handle suggestions for alternate syntax aggregation contexts
2018-11-05 12:15:37 +01:00
Marcus Efraimsson c5ce8536d4 changelog: add notes about closing #13606
[skip ci]
2018-11-05 11:47:34 +01:00
Marcus Efraimsson fdedb917a2 Merge pull request #13892 from grisme/13606-table-cell-background-color
Fix bug with background color in table cell with link
2018-11-05 11:43:47 +01:00
Marcus Efraimsson 32c93793a6 devenv: table panel links 2018-11-05 11:34:25 +01:00
bergquist ccd89eee97 renames debouceduration to for 2018-11-05 11:05:30 +01:00
Marcus Efraimsson 5882e5bb46 Merge pull request #13900 from marefr/ds_cache_refactor
Datasource proxy cache refactor
2018-11-05 11:02:31 +01:00
bergquist d25284a364 introduce state unknown for rules that have not been evaluated yet 2018-11-05 10:50:28 +01:00
bergquist 6f748d8a96 fixes go meta lint issue 2018-11-05 10:50:28 +01:00
bergquist 4526660cb2 wire up debounce setting in the ui 2018-11-05 10:50:28 +01:00
bergquist 2d3a575489 adds db migration for debounce_duration 2018-11-05 10:50:28 +01:00
bergquist ccfd9c89b2 introduces hard coded deboucing for alerting 2018-11-05 10:50:28 +01:00
Marcus Efraimsson 818d48c2c0 always execute the user teams query 2018-11-05 10:49:56 +01:00
Torkel Ödegaard 3e7cd5fa99 Merge branch 'panel-edit-ux' of github.com:grafana/grafana into panel-edit-ux 2018-11-05 10:49:44 +01:00
Torkel Ödegaard 2f4ae1e2d8 Merge branch 'master' into panel-edit-ux 2018-11-05 10:17:09 +01:00
Marcus Efraimsson 5be2332c66 handle error before populating cache 2018-11-05 09:58:13 +01:00
Leonard Gram 5469a1a569 build: fixes gcp push path. 2018-11-05 09:55:19 +01:00
Carl Bergquist c9aba023b5 Merge pull request #13962 from bergquist/alerting_median_tests
alerting: adds tests for the median reducer
2018-11-05 09:25:44 +01:00
Carl Bergquist f43f4a94a7 Merge pull request #13961 from mtanda/cw_doc_math
add minimal permission to docs
2018-11-05 09:10:36 +01:00
bergquist 7c3dcb3702 alerting: adds tests for the median reducer
adds a test that verify that null values are not used
when calculating the median value in alerting

closes #10056
2018-11-05 09:03:35 +01:00
Carl Bergquist 03d02523fd Merge pull request #13956 from bbodenmiller/patch-1
Gitlab -> GitLab
2018-11-05 07:23:55 +01:00
Carl Bergquist 12d38d1fdd Merge pull request #13959 from bbodenmiller/patch-2
typo fix for "has"
2018-11-05 07:22:55 +01:00
Mitsuhiro Tanda cb2a03a08c add minimal permission 2018-11-05 14:27:27 +09:00
ryan eeb80a43f4 Merge remote-tracking branch 'grafana/master'
* grafana/master: (878 commits)
  changelog: adds note about closing #13945
  removed file I added accidentally
  fixed to template PR issues, #13938
  alerting: increase default duration for queries
  Load hash based styles in error.html, too
  Add [hash] to filename of grafana.{light,dark}.css
  Fix minor JSON typo in HTTP API docs
  Added new backend setting for license file
  changelog: add notes about closing #13925
  fix for responsive rule for footer
  Updated login page logo & wordmark and responsive behavior
  added new workmarks
  fixed react whitespace warning on teams page
  renamed org files to match new naming guide
  moved profile pages to it's own feature folder
  moved new teams page
  reload page after preferences update
  Add delta window function to postgres query builder
  Increase Telegram captions length limit.
  Explore: async starts of language provider
  ...
2018-11-04 15:33:04 -08:00
Ben Bodenmiller 355493bf6e typo fix for "has" 2018-11-04 03:22:25 -08:00
Ben Bodenmiller d6cd2a2085 Gitlab -> GitLab 2018-11-04 00:48:30 -07:00
bergquist 65ace003c9 changelog: adds note about closing #13945 2018-11-03 14:03:41 +01:00
Carl Bergquist d2a8a8358c Merge pull request #13945 from bergquist/alerting_increase_default_duration
alerting: increase default duration for queries
2018-11-03 14:02:03 +01:00
Michael Huynh f79b790ef6 Add tests covering alternate syntax for aggregation contexts
Related: #13690
2018-11-03 08:07:08 +08:00
Michael Huynh 5e748243af Handle suggestions for alternate syntax aggregation contexts
In aggregation contexts using the alternate syntax form, labels will
precede metrics. A cursor at the label position cannot provide
meaningful suggestions unless a metric is specified. In the latter case,
no suggestions are presented at all.

Related: #13690
2018-11-03 07:56:13 +08:00
Marcus Efraimsson 5803bfd2c7 fix terms agg order deprecation warning on es 6+ 2018-11-02 17:53:47 +01:00
Marcus Efraimsson 6ef941ea17 fix failing tests 2018-11-02 16:03:12 +01:00
Marcus Efraimsson 940f510856 Merge branch 'cached-signed-in-user' into ds_cache_refactor 2018-11-02 15:42:05 +01:00
Torkel Ödegaard 4f601761df Merge pull request #13938 from tarekbecker/grafana-css-hash
Add [hash] to grafana.{light,dark}.css
2018-11-02 11:36:23 +01:00
Torkel Ödegaard 61ff9fe603 removed file I added accidentally 2018-11-02 11:13:56 +01:00
Torkel Ödegaard b415d82611 fixed to template PR issues, #13938 2018-11-02 10:49:46 +01:00
bergquist bc37e3caa2 alerting: increase default duration for queries
we should promote using longer queries since this should
increase the quality of the alerts. only using a 5min range
means that we will only have 4 datapoints in data is written
every min which is not good enough for the generic alert rule
2018-11-02 10:43:05 +01:00
David Kaltschmidt 583334df05 Explore: Logging graph overview and view options
- Logging gets a graph for log distribution (currently per stream, but I
  think I'll change that to per log-level)
- added grid columns for timestamp and unique labels
- show common labels of streams
- View options to show/hide time columns, label columns
- created `--small` modifier for Switch CSS classes
- merging of streams is now a datasource responsibility
2018-11-02 08:25:36 +01:00
Tarek Becker 70bb81c6eb Load hash based styles in error.html, too 2018-11-01 23:31:17 +01:00
Tarek Becker 4d4eb354b7 Add [hash] to filename of grafana.{light,dark}.css 2018-11-01 21:43:07 +01:00
Torkel Ödegaard 0e26fad30b minor tweak to back to dashboard buttons 2018-11-01 19:25:54 +01:00
Torkel Ödegaard 1bc3d8dad8 Merge branch 'master' into panel-edit-ux 2018-11-01 18:45:15 +01:00
Marcus Efraimsson b770d52e29 Merge pull request #13936 from mminer/fix-minor-docs-typo
Fix minor JSON typo in HTTP API docs
2018-11-01 18:20:17 +01:00
Matthew Miner 7e13aa2cfb Fix minor JSON typo in HTTP API docs 2018-11-01 10:05:26 -07:00
Peter Holmberg e37fa486ed remove replaced components 2018-11-01 14:31:14 +01:00
Peter Holmberg 16d4109599 reverting babel change 2018-11-01 14:03:02 +01:00
Peter Holmberg f95b80b7e1 remove this 2018-11-01 14:01:06 +01:00
Peter Holmberg f5966b44af removed these unused components 2018-11-01 13:59:12 +01:00
Peter Holmberg 6d5f5b644b reverting script change 2018-11-01 13:58:18 +01:00
Peter Holmberg f15ed848f9 Merge branch 'master' into data-source-settings-to-react 2018-11-01 13:52:53 +01:00
Peter Holmberg 6493f96ac7 updated snap 2018-11-01 13:47:40 +01:00
Peter Holmberg 2837fd515f tests 2018-11-01 13:45:52 +01:00
Torkel Ödegaard 4c070bc781 minor doc tweaks 2018-11-01 12:35:51 +01:00
Torkel Ödegaard 5a27df2dc9 updated enterprise page 2018-11-01 12:19:19 +01:00
Torkel Ödegaard 28b0ae1d82 Added new backend setting for license file 2018-11-01 12:07:11 +01:00
Peter Holmberg 7fc4b1934b updating state and save 2018-11-01 11:19:40 +01:00
Marcus Efraimsson a1b4ebc115 make permission sub items in sidemenu cleaner 2018-11-01 11:00:32 +01:00
Torkel Ödegaard 6a9e18c9cb Merge pull request #13922 from grafana/login-page-update
Updated login page logo & wordmark and responsive behavior
2018-11-01 10:42:34 +01:00
Marcus Efraimsson 8f5fa28a23 changelog: add notes about closing #13925
[skip ci]
2018-11-01 09:57:59 +01:00
Marcus Efraimsson c2e1422c00 Merge pull request #13921 from svenklemm/postgres-delta
Add delta window function to postgres query builder
2018-11-01 09:55:26 +01:00
David Kaltschmidt edd575b552 Explore: fix metric selector for additional rows
- race condition in language provider leads to only one row getting
  selector options
- fixed by always returning the start task promise
2018-11-01 09:46:05 +01:00
Torkel Ödegaard ed0f521279 fix for responsive rule for footer 2018-10-31 13:44:22 -07:00
Torkel Ödegaard 4dad8d946e Updated login page logo & wordmark and responsive behavior 2018-10-31 13:40:58 -07:00
Torkel Ödegaard 74c9defede added new workmarks 2018-10-31 20:56:04 +01:00
David e5aeb00636 Merge pull request #13918 from grafana/davkal/explore-syntax-start
Explore: async starts of language provider
2018-10-31 20:45:33 +01:00
Torkel Ödegaard ee5b37eb2c Merge pull request #13878 from grafana/org-page-to-react
Org page to react
2018-10-31 20:39:56 +01:00
Torkel Ödegaard d8e257e633 fixed react whitespace warning on teams page 2018-10-31 12:39:02 -07:00
Torkel Ödegaard 1f61b37bf7 Merge pull request #13919 from skgsergio/increase-telegram-caption-imit
Increase Telegram captions length limit
2018-10-31 20:34:11 +01:00
Torkel Ödegaard d64edc4a29 renamed org files to match new naming guide 2018-10-31 12:28:26 -07:00
Torkel Ödegaard dcf8327dc9 moved profile pages to it's own feature folder 2018-10-31 12:25:46 -07:00
Torkel Ödegaard 17386c49d4 moved new teams page 2018-10-31 12:21:16 -07:00
Torkel Ödegaard 99d0beeaa9 reload page after preferences update 2018-10-31 12:18:19 -07:00
Sven Klemm f608340c35 Add delta window function to postgres query builder
Unlike the increase function delta doesn't check for resets
and can go negative. This is similar to the prometheus delta
function.
2018-10-31 19:26:18 +01:00
Sergio Conde Gomez 65a15b157f Increase Telegram captions length limit. 2018-10-31 18:07:09 +01:00
Torkel Ödegaard 74a0c0e618 update angular state on props update 2018-10-31 10:03:03 -07:00
Marcus Efraimsson 280c8631f9 docs: enhanced ldap 2018-10-31 18:01:30 +01:00
David Kaltschmidt 4f959648a7 Explore: async starts of language provider
- changed `start()` to return promise on main language feature task
- promise resolves to list of secondary tasks
- speeds up time to interaction of metric selector
- lazy loading of certain metric selector and log label selector items
- loading indication of metric and log label selectors
2018-10-31 17:53:28 +01:00
Torkel Ödegaard 7885453bcd listen for changes in angular land and propagate that back to react 2018-10-31 09:19:08 -07:00
Marcus Efraimsson 5495072c83 docs: fix datasource permissions keywords 2018-10-31 17:18:31 +01:00
Leonard Gram 5c1615292a build: grafana enterprise docker image. 2018-10-31 16:02:36 +01:00
Torkel Ödegaard c105e91181 Merge pull request #13915 from grafana/IE11-graph-legend-below-fix
IE11 fix for legend tables below graph
2018-10-31 14:50:21 +01:00
Torkel Ödegaard 93453c2d94 added caching of signed in user DB calls 2018-10-31 06:47:14 -07:00
Peter Holmberg 2342f60a31 added actions 2018-10-31 14:28:16 +01:00
Torkel Ödegaard 07d78da5ec Merge branch 'ds_cache_refactor' of https://github.com/marefr/grafana into marefr-ds_cache_refactor 2018-10-31 06:06:24 -07:00
Torkel Ödegaard d46c258933 IE11 fix for legend tables below graph 2018-10-31 06:03:26 -07:00
Torkel Ödegaard 749d7a2f0c Merge pull request #13913 from Yukinoshita-Yukino/master
Add only display date option to table panel column
2018-10-31 13:31:43 +01:00
Peter Holmberg 1656f03acd cleaned up render 2018-10-31 13:29:02 +01:00
Peter Holmberg 5140325a0d renders angular component 2018-10-31 13:23:05 +01:00
Torkel Ödegaard 32ca8b7aad updated api keys snapshot 2018-10-31 12:54:30 +01:00
Torkel Ödegaard 05dee9e340 Merge branch 'mondras-empty-cta-apikeys' 2018-10-31 12:51:36 +01:00
Torkel Ödegaard 95a8a59845 restored transition 2018-10-31 12:50:44 +01:00
Torkel Ödegaard 89cd15d98c removed logging call 2018-10-31 04:38:16 -07:00
Torkel Ödegaard dfb9419f86 Merge branch 'graph-legend-to-react' 2018-10-31 04:26:44 -07:00
Yuan Liu 6daf73fec0 add table column date format 2018-10-31 18:51:34 +08:00
Torkel Ödegaard 36cd73819a fixed memory leaks and minor refactoring 2018-10-31 03:40:03 -07:00
Leonard Gram baea76c4ea build: gpc credentials added to deploy. 2018-10-31 11:16:48 +01:00
Marcus Efraimsson dab833a83c changelog: add notes about closing #13762
[skip ci]
2018-10-31 10:55:25 +01:00
Marcus Efraimsson e331c0c1c7 update changelog
[skip ci]
2018-10-31 10:54:19 +01:00
Marcus Efraimsson f348acccf3 Merge pull request #13758 from grafana/mysql_query_builder
mysql graphical query builder
2018-10-31 10:52:16 +01:00
Leonard Gram 4954a49da9 build: deploys to gcp. 2018-10-31 10:49:09 +01:00
Leonard Gram 1a0b75bc44 build: deploys to gcp. (#13911) 2018-10-31 09:51:11 +01:00
David e99c1b4838 Merge pull request #13904 from grafana/davkal/explore-logging
Explore: repair logging after recent Explore restructuring
2018-10-31 09:19:38 +01:00
Marcus Efraimsson fc6d7c9b6b datasource permission http api 2018-10-30 19:02:12 +01:00
Marcus Efraimsson 621525d10f restructure administration/permissions page into a section with sub pages 2018-10-30 18:43:54 +01:00
David Kaltschmidt 037167ff07 Fix TimePicker test by enforcing UTC on date string 2018-10-30 16:50:03 +01:00
Peter Holmberg a7bd944098 updated view to use angular loader 2018-10-30 16:40:08 +01:00
David Kaltschmidt c92f5462fe Explore: repair logging after code restructuring
this is a fix-up PR that cleans up Explore Logging after the recent
restructuring.

- log results need to be merged since query transactions have been
  introduced
- logging DS has its own language provider, query field, and start page
  (some of them based on prometheus components)
- added loader animation to log viewer
- removed logging logic from prometheus components
2018-10-30 16:35:49 +01:00
Marcus Efraimsson a00999fd89 docs: schema -> database 2018-10-30 16:25:36 +01:00
Leonard Gram 3d452e5a46 build: deployment ci container. (#13902) 2018-10-30 15:56:52 +01:00
Marcus Efraimsson 00a997b7a8 docs: mysql 2018-10-30 15:45:39 +01:00
Torkel Ödegaard a8e2840f15 minor progress 2018-10-30 15:25:10 +01:00
Torkel Ödegaard e9928f6c52 Merge branch 'master' into enterprise-docs 2018-10-30 15:01:09 +01:00
David 758ec4bc70 Merge pull request #13844 from grafana/davkal/explore-empty-page
Explore: Pluggable components from datasource plugins
2018-10-30 14:54:34 +01:00
David Kaltschmidt cf19ecc8f5 Make Explore plugin exports explicit 2018-10-30 14:38:34 +01:00
David 45d7516408 Merge pull request #13901 from grafana/davkal/grunt-newer
JS tooling: run TS grunt tasks only when files changed
2018-10-30 14:35:19 +01:00
Marcus Efraimsson d0c00388e6 add functionality to override service in registry 2018-10-30 13:37:30 +01:00
Peter Holmberg 58e94fc0fa moved state 2018-10-30 13:09:59 +01:00
Marcus Efraimsson 6f9c0241af register datasource cache service with proper name 2018-10-30 12:32:14 +01:00
Marcus Efraimsson 5d4dc18bbc revert application lifecycle event support 2018-10-30 12:31:28 +01:00
bergquist b58b4ef128 changelog: adds note about closing #13876 2018-10-30 11:20:49 +01:00
Carl Bergquist 42d902b07d Add new build info metrics that contains more info (#13876)
* Add new build info metrics that contains more info

The goal was to add more information about Grafana. But rather than
just adding those to the current metrics I created a new metric
since its a common pattern in the prometheus community to expose that
info in a metric named `*_build_info`.

We keep the old metric to avoid introducing any breaking changes but
we should be able to remove it the next breaking change
2018-10-30 11:18:43 +01:00
David Kaltschmidt e8a895d58b JS tooling: run TS grunt tasks only when files changed
- using grunt-newer to prefix precommit tasks
- only got it to work for tslint and tsc

Not applied to:

- sasslint does not take the file arguments in a way that grunt-newer
  recognizes
- no-only-tests throws an error when used with `newer`, but it's
  sub-second runtime
2018-10-30 10:25:53 +01:00
Peter Holmberg 7a10bf0141 revert file name change 2018-10-30 09:45:47 +01:00
Marcus Efraimsson 2332b3e205 remove unused code 2018-10-30 09:34:09 +01:00
Marcus Efraimsson 52d825f535 log error on datasource access denied 2018-10-30 09:32:32 +01:00
Marcus Efraimsson 70ddf93688 include teams on signed in user 2018-10-30 09:32:32 +01:00
Marcus Efraimsson 9edaa3fa8c application lifecycle event support 2018-10-30 09:32:32 +01:00
Marcus Efraimsson cfb061ddab refactor datasource caching 2018-10-30 09:31:56 +01:00
Anton 355e76a48e Fix cell coloring 2018-10-29 23:26:29 +03:00
Anton 6092fa4dc3 Fix bug with background color in table cell with link 2018-10-29 23:13:07 +03:00
Torkel Ödegaard 1dc8b898bb add dashnav responsive rule to hide tv button on smaller screens 2018-10-29 19:17:08 +01:00
Nick Triller 3414be18bc Implement oauth_auto_login setting
Redirect in backend
2018-10-29 18:46:52 +01:00
Carl Bergquist c0c2df4da0 Merge pull request #13871 from crab86/patch-2
Updated grafana_stats.json
2018-10-29 17:42:44 +01:00
David a0aaf70060 Merge pull request #13886 from grafana/davkal/explore-fix-cell-click
Explore: fix copy/paste on table cells
2018-10-29 17:06:54 +01:00
David Kaltschmidt 5a23723f2c Explore: fix copy/paste on table cells
When selecting text via mouse, our ReactTable cells' click handler
triggers an event.

- check event target to be the link, only then handle the event
2018-10-29 16:44:50 +01:00
Peter Holmberg 12a63b605f rename type 2018-10-29 16:01:14 +01:00
Peter Holmberg 12336e1548 using label component 2018-10-29 15:59:16 +01:00
David Kaltschmidt d0776937b5 Pluggable components from datasource plugins
- when instantiating a datasource, the datasource service checks if the
  plugin module exports Explore components, and if so, attaches them to
  the datasource
- Explore component makes all major internal pluggable from a datasource
  `exploreComponents` property
- Moved Prometheus query field to promehteus datasource and registered
  it as an exported Explore component
- Added new Start page for Explore, also exported from the datasource
2018-10-29 15:14:36 +01:00
Peter Holmberg 70f6100d53 fixed type 2018-10-29 15:08:36 +01:00
David b00e709aee Merge pull request #13842 from grafana/davkal/explore-error-handling
Explore: error handling and time fixes
2018-10-29 15:08:14 +01:00
Peter Holmberg 7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Peter Holmberg 7dc5173a9b removed angular code 2018-10-29 14:21:11 +01:00
Torkel Ödegaard befee108c4 Merge pull request #13872 from grafana/css-loading-sync
Revert to sync loading of css, sometimes js loaded before css which c…
2018-10-29 13:48:39 +01:00
Peter Holmberg 026588cbf1 test and some refactoring 2018-10-29 13:46:12 +01:00
Torkel Ödegaard 2481d19dc8 Merge pull request #13875 from bergquist/branch_param_to_build
build: adds branch info to binary build
2018-10-29 13:45:27 +01:00
bergquist c9ac762fb1 build: adds branch info to binary build 2018-10-29 13:27:29 +01:00
Torkel Ödegaard dc961a8274 Merge pull request #13870 from grafana/davkal/make-node_modules
Makefile: dependency-driven target to build node_modules
2018-10-29 12:31:23 +01:00
Torkel Ödegaard 2dde2c4f9b now that css is loaded sync again I can remove some styles from index html body css 2018-10-29 04:26:44 -07:00
David Kaltschmidt c1347e4ecb WIP babel 7 2018-10-29 12:20:10 +01:00
Torkel Ödegaard d06ad98ec9 Revert to sync loading of css, sometimes js loaded before css which caused issues 2018-10-29 04:19:45 -07:00
Sebastian 85aed0276e Update grafana_stats.json
The grafana_stats.json used the following prometheus query: "increase(grafana_alerting_result_total[1m])" But a metric called "grafana_alerting_result_total" is currently not there anymore. So i changed the query to "increase(grafana_alerting_active_alerts[1m])" and updated the title as well (Before: "Grafana alert results", Now: "Grafana active alerts").
2018-10-29 12:05:24 +01:00
David Kaltschmidt a4ef1d6175 Makefile: dependency-driven target to build node_modules
- added `node_modules` as new target
- dependency on `package.json` and `yarn.lock` allows for quick `make
  node_modules` after a branch change, which noops when the deps have
 not changed
- also added `clean` target
2018-10-29 11:08:30 +01:00
Carl Bergquist 1f6df77a80 Merge pull request #13869 from bergquist/delete_old_deocs
removes old invalid release guide
2018-10-29 10:47:18 +01:00
bergquist 0e34a6be0f removes old invalid release guide
closes #13864
2018-10-29 10:37:30 +01:00
Torkel Ödegaard 1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +01:00
Torkel Ödegaard e47de5602b added missing alpha state prop to graph2 panel 2018-10-28 12:46:18 -07:00
Torkel Ödegaard e24dc37966 minor update 2018-10-28 12:44:47 -07:00
Torkel Ödegaard 5dd9247762 Merge branch 'master' into panel-edit-ux 2018-10-28 12:11:47 -07:00
Torkel Ödegaard 9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
Torkel Ödegaard 7863d2d882 Merge branch 'master' of github.com:grafana/grafana 2018-10-28 11:34:25 -07:00
Torkel Ödegaard 52669032d0 updated graph tests dashboard 2018-10-28 11:29:55 -07:00
Torkel Ödegaard d94cd3f2b4 Merge branch 'fix-missing-points' of https://github.com/jsferrei/grafana into jsferrei-fix-missing-points 2018-10-28 11:17:36 -07:00
Torkel Ödegaard 9f35b8a65e Merge pull request #13827 from grafana/remove-projectname-from-query-response
stackdriver: Remove redundant project name assignment
2018-10-28 19:08:38 +01:00
Torkel Ödegaard 6bf0531f81 fixed width of panel edit mode 2018-10-28 10:26:49 -07:00
David 121ac93d08 Merge pull request #13847 from miqh/fix/multi-line-aggregation
Fix label suggestions inside multi-line aggregation contexts
2018-10-28 18:05:31 +01:00
David Kaltschmidt 9245dad53e Fix query hint tests after refactor 2018-10-28 17:48:17 +01:00
David 2ec827f02f Merge pull request #13774 from miqh/feat/sum-query-suggestion
Implement sum aggregation suggestion with placeholder support
2018-10-28 17:37:42 +01:00
Torkel Ödegaard 8faf74d441 Merge pull request #13862 from buroa/master
Fixing issue 13855
2018-10-28 15:38:23 +01:00
Steve Kreitzer e44dde3f14 Fixing issue 13855 2018-10-28 10:25:42 -04:00
Michael Huynh d1d5e9f7d3 Add tests to cover PlaceholdersBuffer and sum hint
Related: #13615
2018-10-28 21:07:40 +08:00
Michael Huynh c255b5da11 Add sum aggregation query suggestion
Implements rudimentary support for placeholder values inside a string
with the `PlaceholdersBuffer` class. The latter helps the newly added
sum aggregation query suggestion to automatically focus on the label
so users can easily choose from the available typeahead options.

Related: #13615
2018-10-28 21:03:39 +08:00
Torkel Ödegaard 60b6bd10a4 fixes to angular panel edit mode 2018-10-28 11:31:42 +01:00
Torkel Ödegaard 3da62f1083 Merge branch 'master' into panel-edit-ux 2018-10-27 17:44:04 +02:00
Torkel Ödegaard add2e4447e Merge pull request #13849 from grafana/mode-change-performance-changes
Reduce re-renderings when changing view modes
2018-10-27 17:43:42 +02:00
Torkel Ödegaard c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard 4d4369b77f Merge branch 'master' into panel-edit-ux 2018-10-27 15:14:19 +02:00
Torkel Ödegaard 10e5d725bc updated singlestat logo 2018-10-27 15:13:57 +02:00
Torkel Ödegaard b1b534a005 more ux progress 2018-10-27 15:09:36 +02:00
Michael Huynh 61843b58db Add tests to cover aggregation context cases
This should cover use cases involving multi-line queries and range
vector syntax inside aggregation contexts.

Related: #12890
2018-10-27 17:02:03 +08:00
Michael Huynh 2a4a19388f Fix label suggestions for multi-line aggregation queries
No label suggestions were being returned for multi-line aggregation
contexts because the parsed selector string does not see the full
context before a `by` or `without` clause.

This solution stitches together all text nodes that comprise the query
editor to ensure the selector has sufficient context to generate
suggestions.

Also, an additional workaround has been included to ensure range vector
syntax does not disrupt label suggestions in aggregation contexts.

Related: #12890
2018-10-27 16:54:12 +08:00
Torkel Ödegaard a4674ecaa1 panel edit mode changes 2018-10-27 10:14:38 +02:00
Carlos Mondragon 35688b223a Update snapshots. 2018-10-26 10:20:03 -07:00
Carlos Mondragon bb227d5c3a Use jest.fn instead of string. 2018-10-26 10:12:27 -07:00
David Kaltschmidt bf1af66292 Explore: error handling and time fixes
- use global range types
- add ErrorBoundary around individual Explore components
- fix table merge on empty results
- fix TimePicker date parsing on ISO dates
- fix TimePicker range string after relative move
2018-10-26 18:16:00 +02:00
Torkel Ödegaard bcf669fab5 ux experiments 2018-10-26 16:29:08 +02:00
Leonard Gram 58a567173e build: builds grafana docker for enterprise at release. 2018-10-26 15:19:53 +02:00
Jon Ferreira 07cb622729 Add code to flot that plots any datapoints which to not have neighbors
as 0.5 radius points
 - fixes https://github.com/grafana/grafana/issues/13605
2018-10-26 09:10:07 -04:00
Peter Holmberg ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Leonard Gram a80e2e1acd build: ge build fix. 2018-10-26 14:37:51 +02:00
Leonard Gram e2f74b55d2 build: grafana enterprise docker. (#13839) 2018-10-26 14:23:30 +02:00
Peter Holmberg affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
Torkel Ödegaard 94c35e2577 testing panel edit ux idea 2018-10-26 13:20:10 +02:00
David 239dfbc9ae Merge pull request #13824 from grafana/davkal/explore-plugins
Explore: move suggestions logic to datasource language provider
2018-10-26 11:40:52 +02:00
Marcus Efraimsson 361864bec6 changelog: add notes about closing #13769
[skip ci]
2018-10-26 09:06:32 +02:00
Marcus Efraimsson 6052257515 Merge pull request #13820 from grafana/13769_mysql_time_filter
mysql: fix timeFilter macro should respect local time zone
2018-10-26 09:02:59 +02:00
Torkel Ödegaard b3c7a41e13 Merge pull request #13819 from mtanda/cw_desc_region
use default region to call DescribeRegions
2018-10-26 08:35:17 +02:00
Mitsuhiro Tanda 220c4f4ab4 add test 2018-10-26 03:13:02 +09:00
Mitsuhiro Tanda 3447b8b299 cache region result 2018-10-26 01:23:44 +09:00
Mitsuhiro Tanda c40baa1a23 use default region to call DescribeRegions 2018-10-26 01:23:44 +09:00
Torkel Ödegaard e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard 4112591042 Merge pull request #13818 from mtanda/cw_stat_template
support template variable in stat field
2018-10-25 17:08:09 +02:00
Torkel Ödegaard 2b1ab9843d Merge pull request #13828 from bergquist/docs_es_provisioning
docs: improve ES provisioning examples
2018-10-25 17:06:47 +02:00
Torkel Ödegaard f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg a98f7e548f simple select 2018-10-25 16:56:49 +02:00
Leonard Gram 30cb28df55 build: correctly adds enterprise to the filename. (#13831) 2018-10-25 16:55:27 +02:00
Torkel Ödegaard d505d83ee1 Merge pull request #13679 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-25 16:31:53 +02:00
bergquist d9cd20e43e docs: improve ES provisioning examples
closes #12281
2018-10-25 14:36:31 +02:00
bergquist 946ca5477b changelog: adds note about closing #13723
[skip ci]
2018-10-25 14:31:43 +02:00
Erik Sundell 6a447a24fb stackdriver: don't set project name in query response since default project is now loaded in its own query 2018-10-25 14:16:01 +02:00
Athurg Feng 201dd6bf65 Optimize the Dingding match values format 2018-10-25 18:53:45 +08:00
Athurg Feng cb86e38628 Add Dingding message type to support mass text notification 2018-10-25 18:34:34 +08:00
Alexander Zobnin 1dad52eaad graph legend: fix table padding 2018-10-25 13:28:05 +03:00
David Kaltschmidt 6f2315d5c5 Moved prom language features to datasource language provider 2018-10-25 12:24:24 +02:00
Athurg Feng 7f45afac63 Split text template into variable 2018-10-25 18:24:04 +08:00
Athurg Feng ca6dd73923 Add match values into Dingding notification message 2018-10-25 18:23:37 +08:00
Alexander Zobnin 9e15d47e13 graph legend: fix phantomjs rendering when legend is on the right 2018-10-25 13:21:28 +03:00
Torkel Ödegaard be6f68f341 fix for annotation promise clearing, bug introduced last week when merging react panels step1 2018-10-25 11:35:32 +02:00
Alexander Zobnin 533f35853b Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-25 11:56:02 +03:00
Torkel Ödegaard df7915f3b4 Merge pull request #13822 from grafana/fix-solo-panel-size
fix panel solo size
2018-10-25 10:48:39 +02:00
Torkel Ödegaard defccb5ab3 fix panel solo size 2018-10-25 10:32:23 +02:00
Marcus Efraimsson 97b22aa5a9 mysql: fix timeFilter macro should respect local time zone 2018-10-25 10:29:40 +02:00
Peter Holmberg 1f8b61f9a6 load preferences 2018-10-25 07:45:22 +02:00
Mitsuhiro Tanda 08631ea23f support template variable in stat field 2018-10-25 13:03:20 +09:00
Sven Klemm 9bb2b70a95 only look in current database in findMetricTable 2018-10-24 19:21:26 +02:00
Marcus Efraimsson 4ee79faff4 Merge pull request #13811 from Yukinoshita-Yukino/patch-1
Fix doc error for DingDIng alert
2018-10-24 16:45:26 +02:00
Alexander Zobnin e4b3f31f82 graph legend: fix table alignment 2018-10-24 17:38:10 +03:00
Yuan Liu eb255520cb fix dingding doc error 2018-10-24 22:28:59 +08:00
Peter Holmberg 596a83407e fixed routes and page 2018-10-24 16:17:25 +02:00
Alexander Zobnin f5a0b0044a graph legend: minor refactor 2018-10-24 16:57:44 +03:00
Torkel Ödegaard 5a70327dcf Merge pull request #13805 from grafana/13804-fix-template-variable-check
Update the regex-matching in templateSrv to work with the new variabl…
2018-10-24 14:58:13 +02:00
Carl Bergquist 0d41904ee5 Merge pull request #13755 from Yukinoshita-Yukino/master
Fix cannot receive dingding alert when alert message is empty
2018-10-24 14:56:08 +02:00
David Kaltschmidt 54a3e2d1d1 Added types to query rows 2018-10-24 14:55:56 +02:00
Peter Holmberg 8c742a9530 Merge branch 'master' into data-source-settings-to-react 2018-10-24 14:50:33 +02:00
Marcus Efraimsson 259c243723 update latest.json to latest stable version
[skip ci]
2018-10-24 14:37:28 +02:00
Marcus Efraimsson 63c13198e3 changelog: update
[skip ci]
2018-10-24 14:36:26 +02:00
Peter Holmberg f34cbae2dd cleaned up the flow 2018-10-24 14:33:53 +02:00
Marcus Efraimsson 3a1ece537c changelog: add notes about closing #13280
[skip ci]
2018-10-24 13:58:37 +02:00
Marcus Efraimsson 1bcd4c040b Merge pull request #13806 from bergquist/proviosioing_when_folder_is_deleted
Delete provisioning meta data when deleting Folder
2018-10-24 13:55:14 +02:00
bergquist 0a9bfc5529 delete provisioning meta data when deleting folder
prior to this fix Grafana didnt delete meta data
about the provisioned dashboard in `dashboard_provisioning`
which means that the dashboard wasn't inserted into
Grafana again if the folder was delete within Grafana.

closes #13280
2018-10-24 13:32:45 +02:00
Johannes Schill b880f8d548 Update the regex-matching in templateSrv to work with the new variable-syntax and be more flexible to regex-changes #13804 2018-10-24 13:29:03 +02:00
David a6fc74e35b Merge pull request #13803 from grafana/davkal/explore-fix-resize
Explore: fix graph resize on window resize
2018-10-24 12:32:27 +02:00
Marcus Efraimsson 1fbef171c5 changelog: add notes about closing #13600
[skip ci]
2018-10-24 12:08:33 +02:00
Marcus Efraimsson 27cbcbcbc2 changelog: update
[skip ci]
2018-10-24 12:07:27 +02:00
Johannes Schill 38c155403e Move the variable regex to constants to make sure we use the same reg… (#13801) 2018-10-24 12:06:09 +02:00
Marcus Efraimsson 758a5ecf51 docs: fix tutorials index page. Fixes #13799 2018-10-24 11:55:43 +02:00
David 8f7686c5a7 Merge pull request #13773 from miqh/fix/click-typeahead-suggestion
Fix click-based selection of typeahead suggestion
2018-10-24 11:42:58 +02:00
Alexander Zobnin 8a2921399e graph panel: fix legend alignment 2018-10-24 12:42:44 +03:00
David Kaltschmidt d6ff16fe72 Explore: fix graph resize on window resize
- resize HOC wrapper only resized first child which in case of large
  graphs was the warning button
- moved warning button inside the panel parent
2018-10-24 11:30:32 +02:00
David 7d0eccdd23 Merge pull request #13787 from grafana/davkal/explore-transactions
Explore: query transactions for faster result display
2018-10-24 11:24:29 +02:00
Daniel Lee 57a7007421 changelog: adds note for #13691 2018-10-24 11:22:23 +02:00
Marcus Efraimsson 00d6707045 docs: fix tutorials index page. Fixes #13799 2018-10-24 11:21:34 +02:00
Erik Sundell c5af0bf1c5 Resource type filter (#13784)
* stackdriver: add resource type to filter and group bys

* stackdriver: remove not used param

* stackdriver: refactor filter and group by code

* stackdriver: remove resource type if its already in filter list

* stackdriver: remove debug logging

* stackdriver: remove more debug logging

* stackdriver: append resource type to legend name if there are more than one type present in the response

* stackdriver: only make new request if filter has real value

* stackdriver: format legend support for resource type

* stackdriver: add resource type to documentation

* stackdriver: not returning promise from query function

* stackdriver: fix refactoring bug

* stackdriver: remove not used import
2018-10-24 11:18:49 +02:00
David Kaltschmidt a121cd0e49 Fix race condition on add/remove query row 2018-10-24 11:08:15 +02:00
Peter Holmberg ed99a543a5 moving things 2018-10-24 10:23:11 +02:00
Peter Holmberg 3e0a34ceca typing changes 2018-10-24 10:18:28 +02:00
Marcus Efraimsson edba0880fc changelog: add notes about closing #13764
[skip ci]
2018-10-24 09:08:16 +02:00
Mario Trangoni 91447dcbf9 pkg/tsdb/stackdriver/stackdriver.go: Fix regular expression does not contain any meta characters.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/stackdriver/stackdriver.go:171:26⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:47 +02:00
Mario Trangoni bb12a1bc99 pkg/tsdb/graphite/graphite.go: Fix regular expression does not contain any meta characters.
I found this article benchmarking Replace vs Regexp,
https://medium.com/codezillas/golang-replace-vs-regexp-de4e48482f53

See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/graphite/graphite.go:167:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
pkg/tsdb/graphite/graphite.go:172:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:46 +02:00
Mario Trangoni 3466969a7c pkg/login/ldap.go: Fix warning comparison to bool constant
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/login/ldap.go:188:40⚠️ should omit comparison to bool constant, can be simplified to !*extUser.IsGrafanaAdmin (S1002) (megacheck)
2018-10-23 17:26:46 +02:00
Peter Holmberg bd2f9a38d9 Added margin and correct border radius 2018-10-23 17:25:16 +02:00
David Kaltschmidt f19ffee5b4 Fix rebase, fix empty field still issuing query problem 2018-10-23 17:21:33 +02:00
Torkel Ödegaard 6932306995 Merge pull request #13795 from grafana/kiosk-mode-url-fix
Another fix for kiosk mode handling
2018-10-23 17:07:29 +02:00
Leonard Gram 6579070fd2 Changelog: Adds curl to docker image in 5.3.2 2018-10-23 16:22:48 +02:00
Torkel Ödegaard 53d9619cb9 fix: another fix for #13764 , #13793 2018-10-23 16:22:00 +02:00
Torkel Ödegaard 102d495af9 Merge pull request #13793 from grafana/kiosk-mode-url-fix
Kiosk mode url fix
2018-10-23 16:15:50 +02:00
David Kaltschmidt 0cd89e80ca Submit query when enabling result viewer 2018-10-23 16:13:23 +02:00
David Kaltschmidt fbed57ab43 Get query hints per query transaction 2018-10-23 16:10:52 +02:00
Leonard Gram 4cc89f1753 docker: adds curl back into the docker image for utility. (#13794) 2018-10-23 16:10:23 +02:00
David Kaltschmidt 2e02a8c855 Explore: query transactions
Existing querying was grouped together before handed over to the
datasource. This slowed down result display to however long the slowest
query took.

- create one query transaction per result viewer (graph, table, etc.)
  and query row
- track latencies for each transaction
- show results as soon as they are being received
- loading indicator on graph and query button to indicate that queries
  are still running and that results are incomplete
- properly discard transactions when removing or changing queries
2018-10-23 16:09:48 +02:00
Torkel Ödegaard 15e1e41540 Merge pull request #13768 from davewat/feat-toggle-legend-shortcut
Feat - keyboard shortcut to toggle legend
2018-10-23 16:06:32 +02:00
David e761fb1936 Merge pull request #13761 from grafana/davkal/explore-reuse-table-merge
Explore: reuse table merge from table panel
2018-10-23 16:00:57 +02:00
Peter Holmberg bb6409384e connected to store, self remove logic 2018-10-23 16:00:04 +02:00
Torkel Ödegaard 2107f88fc1 Merge pull request #13770 from ceh-forks/editor-duplicate-placeholder
ux: remove duplicate placeholder attribute
2018-10-23 15:52:33 +02:00
Torkel Ödegaard 8a1e0cd83b fix: kiosk url fix, fixes #13764 2018-10-23 15:37:11 +02:00
Marcus Efraimsson f84db5107d changelog: add notes about closing #13633
[skip ci]
2018-10-23 14:17:57 +02:00
Marcus Efraimsson 88e546128c changelog: add notes about closing #13666
[skip ci]
2018-10-23 14:10:05 +02:00
Johannes Schill 22a0f3cf94 fix: Text box variables with empty values should not be considered fa… (#13791)
* fix: text box template variable doesn't work properly without a default value
2018-10-23 14:05:10 +02:00
Alexander Zobnin f150c34b66 Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-23 14:35:55 +03:00
Peter Holmberg bbd02dd616 renaming things 2018-10-23 13:34:27 +02:00
Alexander Zobnin fa5fad5c7e graph legend: review fixes 2018-10-23 14:08:30 +03:00
Marcus Efraimsson 8a3b1cf484 Merge pull request #13785 from grafana/13729_perm_debug
Add debug logging of dashboard permission checks
2018-10-23 11:50:47 +02:00
Marcus Efraimsson b371f2d91f add debug logging of folder/dashbord permission checks 2018-10-23 11:08:57 +02:00
Sven Klemm 2f254187fc Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-23 10:06:34 +02:00
Sven Klemm 261122ff4b sync mysql query editor template with postgres 2018-10-23 10:04:45 +02:00
Sven Klemm fdaa153c95 add char as datatype for metric and group columns 2018-10-23 09:51:17 +02:00
Leonard Gram ab4cc6a9bf build: indentation mistake. 2018-10-23 08:53:36 +02:00
Leonard Gram 3aa0a0ca98 build: fixes filename issues. 2018-10-23 08:33:52 +02:00
Marcus Efraimsson e6abc0691e fix injecting dependencies to graph legend directive 2018-10-22 19:23:40 +02:00
Daniel Lee 41018fc788 changelog: adds note for #13669 2018-10-22 18:52:53 +02:00
Daniel Lee 693a3adc72 Merge pull request #13671 from grafana/gce-automatic-authentication
Stackdriver: Add possibility to authenticate using GCE metadata server
2018-10-22 18:46:54 +02:00
Marcus Efraimsson ead6a051df docs: update debian installation instructions 2018-10-22 18:31:31 +02:00
Alexander Zobnin 5a4c362985 Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-22 17:18:35 +03:00
Daniel Lee 6e0728ad88 stackdriver: some tweaks to the text on the config page and in docs 2018-10-22 16:14:17 +02:00
Erik Sundell 6abbf5b3b8 stackdriver: refactoring request builder 2018-10-22 16:12:55 +02:00
Erik Sundell 1756e82d8b stackdriver: remove not used struct 2018-10-22 16:12:55 +02:00
Erik Sundell 89958f2933 stackdriver: remove not needed scope 2018-10-22 16:12:55 +02:00
Erik Sundell a1fee2fd8a stackdriver: add provisioning example for gce authentication 2018-10-22 16:12:55 +02:00
Erik Sundell 0109051b2a stackdriver: add documentation for gce default account authentication 2018-10-22 16:12:22 +02:00
Erik Sundell e13e2f8a45 stackdriver: change name of authentication type 2018-10-22 16:12:22 +02:00
Erik Sundell 5b9cd830d2 stackdriver: improve config page info box documentation 2018-10-22 16:12:22 +02:00
Erik Sundell dd745e0cf0 stackdriver: prevent backend query from being made when there are not yet any defined targets 2018-10-22 16:12:22 +02:00
Erik Sundell 5deba92d05 stackdriver: fix failing tests 2018-10-22 16:12:22 +02:00
Erik Sundell ae8a765190 stackdriver: improve error handling 2018-10-22 16:12:22 +02:00
Alexander Zobnin 91636ec122 graph legend: fix legend when series are having the same alias 2018-10-22 17:12:18 +03:00
Erik Sundell 5b04a8b6c2 stackdriver: remove not used query file 2018-10-22 16:11:17 +02:00
Erik Sundell 1a329e4e47 stackdriver: remove test datasource query. use ensuredefaultproject instead 2018-10-22 16:11:17 +02:00
Erik Sundell b02a8127ff stackdriver: remove debug comments 2018-10-22 16:11:17 +02:00
Erik Sundell a56c5841e9 stackdriver: improve error handling in the datasource 2018-10-22 16:11:17 +02:00
Erik Sundell afe0b4b8db stackdriver: fix typo 2018-10-22 16:11:17 +02:00
Erik Sundell b2c6c743ce stackdriver: add debug logging 2018-10-22 16:11:17 +02:00
Erik Sundell 3999578300 stackdriver: fix broken braces 2018-10-22 16:11:17 +02:00
Erik Sundell 277cae2d85 stackdriver: fix broken condition after rebase 2018-10-22 16:11:17 +02:00
Erik Sundell 3935f9d24c stackdriver: use constant instead of variable 2018-10-22 16:11:17 +02:00
Erik Sundell 569fe2327e stackdriver: remove debug log 2018-10-22 16:11:17 +02:00
Erik Sundell fa1d225743 stackdriver: fix failing test 2018-10-22 16:11:17 +02:00
Erik Sundell 8b4fff8b87 stackdriver: use gce variable 2018-10-22 16:11:17 +02:00
Erik Sundell 4a51d05477 stackdriver: add variable for gce authentication type 2018-10-22 16:11:17 +02:00
Erik Sundell b9cb4649bb stackdriver: get default project from backend. also ensure default project could be retrieved when authentication type is gce 2018-10-22 16:11:17 +02:00
Erik Sundell 09fb1760a1 stackdriver: only load default project from backend if it's not available on the target. this might happen when using gce authentication and provisioning 2018-10-22 16:08:11 +02:00
Erik Sundell 835f1d788e stackdriver: display error message if project name is not present in jwt file 2018-10-22 16:03:14 +02:00
Erik Sundell 9fb1d3a9a6 stackdriver: only load project name if it's not already stored in the ds info json 2018-10-22 16:03:14 +02:00
Erik Sundell cd7b454e25 stackdriver: add default value for authentication type 2018-10-22 16:03:14 +02:00
Erik Sundell 823838a839 stackdriver: wip - remove debug code 2018-10-22 16:03:14 +02:00
Erik Sundell aa2e64e160 stackdriver: improve ui for toggling authentication type 2018-10-22 16:03:14 +02:00
Erik Sundell 0b82fda49c stackdriver: only get default token from metadata server when applying route 2018-10-22 16:03:14 +02:00
Erik Sundell 2b1709b875 stackdriver: only get default token from metadata server when applying route 2018-10-22 16:03:13 +02:00
Erik Sundell dd9e9ed419 stackdriver: make backend query a pure test datasource function 2018-10-22 16:03:13 +02:00
Erik Sundell 9c7022be86 stackdriver: add status code 2018-10-22 16:03:13 +02:00
Erik Sundell 412a1f6d99 stackdriver: wip - return metric descriptors in the format of tablew 2018-10-22 16:03:13 +02:00
Erik Sundell ff5f281508 stackdriver: wip - get metric descriptors in the backend 2018-10-22 16:03:13 +02:00
Erik Sundell 60617d0bf7 stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider 2018-10-22 16:03:13 +02:00
Erik Sundell 77e4c4249d stackdriver: wip - add very basic checkbox for gce auto authentication 2018-10-22 16:03:13 +02:00
Erik Sundell 102f531c1e stackdriver: break out project name resolving into its own function in the stackdriver.go file 2018-10-22 16:03:12 +02:00
Erik Sundell 3f9ed2efaa stackdriver: wip - temp remove jwt token auth 2018-10-22 16:03:12 +02:00
Erik Sundell b2de0d8c3e stackdriver: wip - always use gce default account for stackdriver 2018-10-22 16:03:12 +02:00
Erik Sundell 2002162073 stackdriver: wip - add scope and remove debug code 2018-10-22 16:03:12 +02:00
Erik Sundell df215d9d09 stackdriver: WIP - test retrieving project id from gce metadata 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda fbe0ffd10b skip jwt token auth if privateKey is empty 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda 43aa6603a3 fetch token from GCE metadata server 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda 022a45becd Revert "for development"
This reverts commit cf2f110e42bb0ca041be7bb0ebf549bf565c51bc.
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda 5b53c0497a for development 2018-10-22 16:03:11 +02:00
Alexander Zobnin 011d7ffa70 graph legend: fix quotes displaying
React already escapes all strings, so it's no need to pass escaped alias
2018-10-22 16:46:13 +03:00
Alexander Zobnin 36354856f9 graph legend: minor refactor 2018-10-22 15:59:08 +03:00
Peter Holmberg c92813f313 Merge branch 'master' into data-source-settings-to-react 2018-10-22 14:49:41 +02:00
Leonard Gram 6c473d33f4 Enterprise crosscompilation (#13783)
* build: crosscompilation and release of enterprise.
2018-10-22 14:33:19 +02:00
Peter Holmberg b7d821b524 component working 2018-10-22 14:22:40 +02:00
Alexander Zobnin 302158fb2b graph legend: fix rendering after legend changes 2018-10-22 15:02:06 +03:00
Alexander Zobnin 4b9462993e graph legend: refactor, fix another review issues 2018-10-22 14:17:46 +03:00
Torkel Ödegaard 16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Michael Huynh 3bb0b0a551 Fix click-based selection of typeahead suggestion
In short, the underlying problem appears to be the `onChange()` handler
being triggered after handling the blur event. Since the contents have
not actually changed this forces the typeahead state to reset which
undesirably puts a stop to propagating the selected suggestion back up
to get set.

Related: #13604
2018-10-21 12:51:21 +08:00
Emil Hessman 30baaa48fe ux: remove duplicate placeholder attribute 2018-10-20 15:08:38 +02:00
Dave Waters 4b524fafa5 initial work to add shortcut to toggle legend - generic 2018-10-19 16:33:23 -04:00
Mario Trangoni 9108966fcb scripts/build/publish.go: Fix warning on err variable.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
scripts/build/publish.go:126:48⚠️ argument err is overwritten before first use (SA4009) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni 68507e8855 pkg/services/alerting/reader.go: Fix should use for range instead of for { select {} }.
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/alerting/reader.go:37:2⚠️ should use for range instead of for { select {} } (S1000) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni e673337cb9 pkg/middleware/middleware.go: Fix empty branch warning.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/middleware/middleware.go:46:3⚠️ empty branch (SA9003) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni abb6b135a3 pkg/plugins/plugins.go: remove ineffective break statement.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/plugins/plugins.go:124:4⚠️ ineffective break statement. Did you mean to break out of the outer loop? (SA4011) (megacheck)
2018-10-19 19:49:04 +02:00
Sven Klemm 7c8b4915c1 fix order for mysql, remove postgres specific code 2018-10-19 18:23:03 +02:00
Marcus Efraimsson 8be4490e75 Merge pull request #13760 from grafana/stackdriver-provisioning-documentation
Add defaultProject to Stackdriver provisioning documentation
2018-10-19 15:55:11 +02:00
Peter Holmberg 5f515bb3fc using react component 2018-10-19 15:33:16 +02:00
David Kaltschmidt 374fe9dcb4 Explore: reuse table merge from table panel
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
  models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
  transformer spec
2018-10-19 15:29:58 +02:00
Alexander Zobnin daa95c2375 graph legend: refactor, move behaviour logic into component 2018-10-19 16:20:00 +03:00
Erik Sundell 93a9885d67 stackdriver: add default project to provisioning documentation 2018-10-19 15:15:45 +02:00
Sven Klemm 8ce7e113d9 adjust meta data queries for mysql 2018-10-19 15:07:38 +02:00
Sven Klemm aae21a631e fix references to postgres datatypes 2018-10-19 14:52:25 +02:00
Alexander Zobnin 44ed188c84 graph legend: review fixes 2018-10-19 14:32:37 +03:00
Marcus Efraimsson eabb04cec2 changelog: add notes about closing #13667
[skip ci]
2018-10-19 13:27:21 +02:00
Torkel Ödegaard 4f4bba7f8c Merge pull request #13578 from grafana/react-panels-step1
WIP: React panels step1
2018-10-19 12:59:09 +02:00
Marcus Efraimsson 4e6d59d4f4 changelog: add notes about closing #13718
[skip ci]
2018-10-19 11:39:18 +02:00
Torkel Ödegaard 5b8178cdae fixed gofmt issue after go update 2018-10-19 11:32:36 +02:00
Yuan Liu 68c460a957 fix cannot receive dingding alert bug 2018-10-19 17:17:38 +08:00
Torkel Ödegaard b95d64e7a0 fix: fixed variable srv tests 2018-10-19 11:14:02 +02:00
Marcus Efraimsson b124ba9a83 Merge pull request #13726 from mtanda/cw_unit_override
Allow unit overwrite if cloudwatch/stackdriver datasource response doesn't include unit
2018-10-19 11:02:42 +02:00
Erik Sundell b2932058c7 stackdriver: only add unit to resonse obj if it has a value 2018-10-19 10:42:57 +02:00
Sven Klemm 215ca50cc1 make interpolateVariable arrow function 2018-10-19 10:19:33 +02:00
Torkel Ödegaard 936fe56080 fix: another set of fixes for refresh 2018-10-19 10:05:48 +02:00
Torkel Ödegaard 11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Sven Klemm c4452ba335 Fix tslint errors 2018-10-18 20:01:40 +02:00
Sven Klemm 5d8826d034 Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-18 19:28:52 +02:00
Torkel Ödegaard 5bd11744dd Merge pull request #13670 from svenklemm/metrics-segment-xss
Escape values in metric segment and sql part
2018-10-18 17:24:47 +02:00
Erik Sundell 0f0763b6b8 stackdriver: fix failing tests 2018-10-18 16:45:46 +02:00
Erik Sundell d1740f090a stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made 2018-10-18 16:42:08 +02:00
Sven Klemm 2803cdca40 Fix variable highlighting 2018-10-18 15:04:54 +02:00
David Kaltschmidt 34ef5e77b7 Fixed yarn.lock (previous merge took out integrity) 2018-10-18 14:51:26 +02:00
Marcus Efraimsson 9f2bdea99d changelog: add notes about closing #13710
[skip ci]
2018-10-18 14:50:00 +02:00
Torkel Ödegaard 5c95a01229 Merge branch 'master' of github.com:grafana/grafana 2018-10-18 14:38:43 +02:00
Torkel Ödegaard 10d706dccf wip: enterprise docs 2018-10-18 14:34:25 +02:00
Torkel Ödegaard 0f592679f9 Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin
fix LDAP Grafana admin logic
2018-10-18 14:15:47 +02:00
Mitsuhiro Tanda 4687ce2f7b allow unit override if cloudwatch response unit is none 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda e465b2d53a Revert "don't overwrite unit if user set"
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.
2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda 287ba77abf don't overwrite unit if user set 2018-10-18 20:51:46 +09:00
Marcus Efraimsson d3c28a814a changelog: add notes about closing #13674
[skip ci]
2018-10-18 13:45:50 +02:00
Marcus Efraimsson 77f23018a5 Merge pull request #13684 from mtanda/cw_concurrent_map
fix concurrent map writes
2018-10-18 13:41:39 +02:00
Torkel Ödegaard 0b490912bd Merge pull request #13716 from grafana/davkal/13613-fix-split-layout
Explore: fix render issues in split view
2018-10-18 13:00:23 +02:00
David bf1a0585ed Merge pull request #13712 from grafana/davkal/explore-react-table
Explore: Use react-table as table component
2018-10-18 12:44:56 +02:00
Adrien Fillon 781e66ba3c fix LDAP Grafana admin logic
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
2018-10-18 12:36:48 +02:00
Alexander Zobnin 5f712ab529 graph legend: remove unused code 2018-10-18 12:31:06 +03:00
Alexander Zobnin fe0c5c73dd graph legend: refactor 2018-10-18 12:30:34 +03:00
Leonard Gram 287d0e8333 docs: cleanup of how to build for docker.
[skip ci]
2018-10-18 11:10:39 +02:00
David Kaltschmidt 9e647590ac Review feedback, increased height 2018-10-18 10:42:25 +02:00
Marcus Efraimsson 367a2af1c2 changelog: add notes about closing #12342
[skip ci]
2018-10-18 09:50:21 +02:00
Marcus Efraimsson a776120bee update changelog
[skip ci]
2018-10-18 09:47:18 +02:00
Marcus Efraimsson 1d0dee189c Merge pull request #13705 from Yukinoshita-Yukino/master
Add socket support for mysql data source
2018-10-18 09:45:50 +02:00
Peter Holmberg ab2be340f7 remove not used file 2018-10-18 09:34:51 +02:00
Peter Holmberg 02769b6d3c Merge branch 'master' into datasource-dashboards-to-react 2018-10-18 08:34:31 +02:00
Yuan Liu f640df7a2c simplify code 2018-10-18 01:45:14 +08:00
David Kaltschmidt a1410b54a5 Explore: fix render issues in split view
- avoid line wrap in row tools (add/remove/clear)
- avoid text overflow in query field
2018-10-17 17:59:03 +02:00
David 1d60c45a04 Merge pull request #13663 from miqh/fix/label-value-suggestions
Fix typeahead behaviour for QueryField
2018-10-17 16:56:02 +02:00
Marcus Efraimsson da89c27caf Merge pull request #13702 from grafana/data-source-instance-to-react
Support Data source permissions
2018-10-17 16:54:57 +02:00
Leonard Gram 675bf00727 A list of where to make changes when upgrading Go and Node.js (#13693) 2018-10-17 16:39:03 +02:00
Peter Holmberg 84bbfe11ca tests 2018-10-17 16:14:45 +02:00
Michael Huynh 22e0ff8b9c Update PromQueryField tests to address fixed bug
Related: #13484
2018-10-17 22:09:21 +08:00
Michael Huynh a8c5ab76b3 Fix typeahead behaviour for QueryField
These changes were originally intended to address a bug whereby a
suggestion for an already selected label value continues to appear.
However, they also appear to fix several other problems in the area:

- Wrong suggestions when using negated label matching operators
- Misaligned label value suggestion replacements

Related: #13484
2018-10-17 22:09:03 +08:00
Leonard Gram 3245227016 permissions: cleanup. 2018-10-17 15:58:52 +02:00
Peter Holmberg c2c3e15022 hooked up actions 2018-10-17 15:56:34 +02:00
David Kaltschmidt ff67213b42 Explore: Use react-table as table component
- adds react-table as dependency
- replaces custom table component in Explore
- vendors react-table styles and overrides them (currently in
  explore.scss)
2018-10-17 14:58:04 +02:00
Peter Holmberg f25a843a2c created view 2018-10-17 14:36:18 +02:00
Leonard Gram cd96ef3590 docs: installing custom plugins in docker.
[skip ci]
2018-10-17 14:34:40 +02:00
Nick Triller 6d0d07a55b Document oauth_auto_login setting 2018-10-17 13:49:43 +02:00
Marcus Efraimsson b036678c89 changelog: add notes about closing #13692
[skip ci]
2018-10-17 13:46:41 +02:00
Marcus Efraimsson cf93b1e700 Merge pull request #13708 from svenklemm/interpolateVariable
postgres: fix template variables error
2018-10-17 13:42:47 +02:00
Marcus Efraimsson 7b656097a7 postgres: use arrow function declaration of interpolateVariable 2018-10-17 13:30:07 +02:00
Sven Klemm ec0fd96f08 Use closure for calling interpolateVariable 2018-10-17 12:30:07 +02:00
Marcus Efraimsson 6a89874290 changelog: add notes about closing #12308
[skip ci]
2018-10-17 12:01:27 +02:00
Marcus Efraimsson 62f21a254a Merge pull request #12337 from mtanda/cw_regions
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00
Yuan Liu 36dbc5f51c Add socket support for mysql data source 2018-10-17 17:45:06 +08:00
Yuan Liu 76fc48e2eb Merge pull request #1 from grafana/master
Syncing
2018-10-17 17:14:13 +08:00
bergquist 2afec0e7fb changelog: adds note about closing #12330 and #6696
[skip ci]
2018-10-17 11:12:39 +02:00
Peter Holmberg 314fffeae1 Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react 2018-10-17 11:12:13 +02:00
Carl Bergquist 94e2d2b483 Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert
Add channel option to disable the resolved alert (OK Message)
2018-10-17 11:08:39 +02:00
Peter Holmberg b7b0ce0107 remove addpermissions component 2018-10-17 11:07:17 +02:00
Torkel Ödegaard 29f1c9259a Merge pull request #13352 from amuraru/patch-2
Updated phantomjs render script to take full height screenshots
2018-10-17 11:00:44 +02:00
Marcus Efraimsson 52f398e7f7 cloudwatch: return a distinct list of regions 2018-10-17 10:58:06 +02:00
Marcus Efraimsson 518e485e36 docs: update cloudwatch iam policy description 2018-10-17 10:52:46 +02:00
Peter Holmberg 34c0bed922 Merge pull request #13700 from grafana/permissions-code-to-enterprise
Permissions code to enterprise
2018-10-17 10:46:53 +02:00
bergquist 70385119bc removes d in disableResolvedMessage 2018-10-17 10:41:18 +02:00
Peter Holmberg dd2fb7961f removed snaps 2018-10-17 10:37:56 +02:00
Peter Holmberg 776f9aa288 Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise 2018-10-17 10:00:18 +02:00
bergquist 5566a61aef alerting: tests default value for disable resolve message 2018-10-17 09:53:03 +02:00
Marcus Efraimsson 176c857900 Merge pull request #13696 from Yukinoshita-Yukino/patch-1
Update doc due to Dingtalk client layout change
2018-10-17 09:37:08 +02:00
Mitsuhiro Tanda c64a5a6e0e re-add hard coded region list 2018-10-17 14:02:02 +09:00
Yuan Liu 7946a405f5 update doc due to client layout change 2018-10-17 10:24:05 +08:00
Dave Waters a3137e731d clean up tests 2018-10-16 20:39:07 -04:00
Dave Waters e9b8051724 Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert 2018-10-16 17:43:26 -04:00
Dave Waters 0eae7b077d fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:38:59 -04:00
Dave Waters c4dcf5a4ee fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:33:38 -04:00
Marcus Efraimsson 03b8bcc43f changelog: add notes about closing #13629
[skip ci]
2018-10-16 19:22:22 +02:00
Marcus Efraimsson 3612a1c00e Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option
Add encrypt setting to MSSQL data source.
2018-10-16 19:07:00 +02:00
Ramiro Morales 49a3bd3097 add encrypt connstr param conditionally on the value chosen via GUI. 2018-10-16 13:14:22 -03:00
Alexander Zobnin 46ec15a11e graph legend: add color picker (react) 2018-10-16 16:50:43 +03:00
Peter Holmberg 66311a065c removing datasource permissions states from grafana 2018-10-16 15:36:33 +02:00
Marcus Efraimsson a825f42aaf update latest.json to latest stable version
[skip ci]
2018-10-16 15:00:28 +02:00
Marcus Efraimsson c9db7f7cfa update changelog
[skip ci]
2018-10-16 14:59:17 +02:00
Leonard Gram f1ab0ea491 build: Upgraded nodejs to 8 on appveyor 2018-10-16 14:32:25 +02:00
Leonard Gram 1329c70965 codestyle 2018-10-16 14:22:50 +02:00
Dave Waters 18c73631ea rename UI Option, align with control, update tests 2018-10-16 07:12:32 -04:00
Alexander Zobnin 5a2e399d2d Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-16 13:49:13 +03:00
Peter Holmberg ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Peter Holmberg ef0def2277 Merge branch 'master' into permissions-code-to-enterprise 2018-10-16 11:09:58 +02:00
Peter Holmberg 8ef705f2b5 pausing for now 2018-10-16 09:59:03 +02:00
Torkel Ödegaard c1399a0404 Merge pull request #13686 from grafana/logo-alt-text
Logo alt text + unwanted char
2018-10-16 09:58:35 +02:00
Johannes Schill 2a82b57d93 Remove unwanted char 2018-10-16 08:11:26 +02:00
Johannes Schill 6d3f037ef1 Fix incorrect alt text on logo 2018-10-16 07:50:44 +02:00
Mitsuhiro Tanda fce50cf1b8 return default region list from backend 2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda a417d6fa21 don't merge hard coded region list 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 61e2710961 add error message 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 6564abd5f3 get regions from after datasource save 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda f6cb01d38a show all CloudWatch regions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 2b20402d7d get region list from ec2:DescribeRegions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 48aef0c50e fix concurrent map writes 2018-10-16 11:45:58 +09:00
Ramiro Morales cf6faabd12 update, don't remove 'Known Issues' docs section. 2018-10-15 21:51:21 -03:00
Ramiro Morales 6a8d1c4546 update provisioning docs. 2018-10-15 21:46:26 -03:00
Ramiro Morales 90de703ef2 fix new setting default value handling. 2018-10-15 21:41:00 -03:00
Ramiro Morales d859a6aeb8 rename new JSON data attrbute. 2018-10-15 20:34:03 -03:00
Marcus Efraimsson f4b7b003be changelog: add notes about closing #13464
[skip ci]
2018-10-16 01:08:37 +02:00
Marcus Efraimsson baa3985478 changelog: add notes about closing #13553
[skip ci]
2018-10-16 01:05:45 +02:00
Marcus Efraimsson e86027e3d3 update changelog
[skip ci]
2018-10-16 01:03:20 +02:00
Carl Bergquist efe9d27820 Merge pull request #13683 from eripe970/patch-2
Small readme update, link to license
2018-10-15 23:59:56 +02:00
Carl Bergquist 795a24d027 Merge pull request #13681 from eripe970/patch-1
Small fixes to documentation
2018-10-15 23:59:27 +02:00
Erik Pettersson 85597862f3 doc(documentation) license
Link to the grafana license file from the docs.
2018-10-15 23:42:49 +02:00
Erik Pettersson 25b68809b0 doc(documenation)
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
2018-10-15 23:35:47 +02:00
Dave Waters 6376154b16 add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal. 2018-10-15 17:16:14 -04:00
Torkel Ödegaard ae7a1bc139 Can render graph 2018-10-15 21:52:24 +02:00
Ramiro Morales 37f16ca80a Add 'encrypt' setting to MSSQL data source.
Fixes #13629
2018-10-15 14:47:54 -03:00
Torkel Ödegaard 938541be2e Merge pull request #13660 from grafana/alerting-validation-messages
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
Marcus Efraimsson 709458501e Merge pull request #13675 from ankon/patch-1
Fix grammar in log message
2018-10-15 17:27:02 +02:00
Peter Holmberg 7c3d101253 rendering settings 2018-10-15 16:45:39 +02:00
Leonard Gram 6fd3430677 build: makes sure publisher.sh is available when deploying. 2018-10-15 14:54:21 +02:00
Andreas Kohn 272274220c Fix grammar in log message 2018-10-15 14:37:12 +02:00
Marcus Efraimsson bac937f079 changelog: add notes about closing #13641 #13650
[skip ci]
2018-10-15 14:28:47 +02:00
Sven Klemm 20c1a58488 Escape typeahead values in query_part 2018-10-15 14:05:07 +02:00
Sven Klemm 3a25a0de83 Escape values in metric segment and sql part 2018-10-15 13:53:37 +02:00
Marcus Efraimsson e830352d38 changelog: add notes about closing #13628
[skip ci]
2018-10-15 11:46:12 +02:00
Marcus Efraimsson 9f85a7494a Merge pull request #13651 from grafana/13628_fix_dag
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
2018-10-15 11:42:59 +02:00
Marcus Efraimsson d9b73418f1 update .bra.toml for using latest bra version 2018-10-15 11:03:24 +02:00
Carl Bergquist 3f6f98a532 Merge pull request #13661 from mjtrangoni/remove-os-kill
Remove os.Kill as it cannot be trapped
2018-10-15 08:47:26 +02:00
Torkel Ödegaard a28c25a2e0 progress on react time series infra 2018-10-15 08:22:20 +02:00
Torkel Ödegaard 9adad76f52 wip: began first steps for a react graph component 2018-10-14 22:24:18 +02:00
Torkel Ödegaard 2fb721d3c6 various fixes to to queries tab (in react mode) 2018-10-14 21:14:11 +02:00
Torkel Ödegaard 8e85295b2b react panels query processing 2018-10-14 18:19:49 +02:00
Torkel Ödegaard 543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard 2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard 0662b5f962 fixing unit tests 2018-10-14 11:13:04 +02:00
Torkel Ödegaard 631af46c48 Merge branch 'master' into react-panels-step1 2018-10-14 10:44:38 +02:00
Torkel Ödegaard a029492d91 Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue
Fix graph render blocked by annotations issue
2018-10-14 10:35:16 +02:00
Torkel Ödegaard 5e9ef5f699 Merge pull request #13664 from steaksauce-/master
Removed reference to plugin_api.md (SDK Readme)
2018-10-14 10:23:46 +02:00
Torkel Ödegaard 3de439ddca Update CHANGELOG.md 2018-10-14 10:23:15 +02:00
Torkel Ödegaard 40e3758698 Merge pull request #13662 from franciscocpg/adding-time-clock
Adding time clock
2018-10-14 10:19:39 +02:00
Torkel Ödegaard 37548792f5 Merge pull request #13659 from grafana/graph-time-format-fix
fix for graph time formating for Last 24h ranges
2018-10-14 10:16:37 +02:00
steaksauce- 77856d090b Removed reference to plugin_api.md (SDK Readme) on the development page as the file that it points to no longer exists. This addresses an open issue on the grafana.org repo 2018-10-13 22:16:47 -05:00
Francisco Guimarães b4bca473db Adding tests 2018-10-13 09:32:21 -03:00
Francisco Guimarães 3db5d14214 Adding time clockms and clocks 2018-10-13 09:03:16 -03:00
Mario Trangoni 6218fadf21 pkg/cmd/grafana-server/main.go: remove os.Kill as it cannot be trapped
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/cmd/grafana-server/main.go:103:42⚠️ os.Kill cannot be trapped (did you mean syscall.SIGTERM?) (SA1016) (megacheck)
2018-10-13 11:02:36 +02:00
Torkel Ödegaard ba67dc7689 changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError 2018-10-12 23:15:23 -07:00
Torkel Ödegaard ec4698fb96 alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message 2018-10-12 23:03:54 -07:00
Torkel Ödegaard d17025fb43 Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Torkel Ödegaard 7051a150cf updated gitignore 2018-10-12 21:55:45 -07:00
Torkel Ödegaard 193829adac Merge pull request #13656 from olshansky/fix-label-values-regex
fix: label values regex for single letter labels
2018-10-13 06:53:33 +02:00
Torkel Ödegaard 8452bbceb3 Merge pull request #13657 from i-ky/patch-1
Typos in plugin development documentation
2018-10-13 06:53:00 +02:00
Torkel Ödegaard 551e0843fa fix for graph time formating for Last 24h ranges, fixes #13650 2018-10-12 21:51:21 -07:00
Mario Trangoni 74533a7a19 pkg/services/sqlstore/user_auth_test.go: comment unused users slice
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
i-ky e950fa7983 fixed a typo 2018-10-13 01:15:16 +03:00
i-ky 7acea2a109 fixed a typo 2018-10-13 00:45:05 +03:00
olshansky 91e201ffa8 fix: label values regex for single letter labels
Closes: #13641
2018-10-12 23:13:11 +03:00
Peter Holmberg e642fce4a5 created component for http settings 2018-10-12 16:16:06 +02:00
Torkel Ödegaard 4fefb2039d Merge pull request #13649 from grafana/update-jest-23-10
updated jest to 23.10
2018-10-12 15:16:12 +02:00
Leonard Gram 97a3a4f33a removes debug log. 2018-10-12 15:13:55 +02:00
Marcus Efraimsson 4b1a2d3b11 make sure to add all variable nodes to dag before linking variables 2018-10-12 14:15:44 +02:00
Daniel Lee 23d38ffc8d changelog: adds note for #13607 2018-10-12 14:00:52 +02:00
Torkel Ödegaard e78c1b4abc Merge pull request #13644 from grafana/backend-hooks-service
Adds backend hooks service so extensions can modify index data
2018-10-12 13:47:40 +02:00
Torkel Ödegaard 50083da29c updated jest to 23.10 2018-10-12 13:46:30 +02:00
Daniel Lee 09c9c2a57b Merge pull request #13624 from grafana/filter-option-fix
Stackdriver: Prevent filter from crashing
2018-10-12 13:36:41 +02:00
Torkel Ödegaard 8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard ca6bfebb7b Update CHANGELOG.md 2018-10-12 11:40:19 +02:00
Torkel Ödegaard 8c9939df72 Adds backend hooks service so extensions can modify index data 2018-10-12 11:26:42 +02:00
Peter Holmberg c5946ebd27 Merge branch 'data-source-instance-to-react' into data-source-settings-to-react 2018-10-12 09:20:43 +02:00
Torkel Ödegaard b5e1a8d7be Merge pull request #13638 from grafana/minor-setting-refactoring
minor setting refactorings
2018-10-12 08:58:21 +02:00
Peter Holmberg c9721bf8cc fix route issue 2018-10-12 08:54:37 +02:00
Torkel Ödegaard d6292f8345 removed unused setting variable 2018-10-12 08:15:01 +02:00
Torkel Ödegaard d5d8d7efa6 minor setting refactorings 2018-10-12 07:55:36 +02:00
Torkel Ödegaard c1fd4265a9 renamed extension point in the frontend 2018-10-12 07:19:05 +02:00
Torkel Ödegaard cdfbcbce22 updated circleci build-container version 2018-10-11 22:06:36 +02:00
Torkel Ödegaard 4aa7dc0c85 minor change to cloudwatch code formatting 2018-10-11 12:58:17 -07:00
Torkel Ödegaard caf995bb94 Merge branch 'update-cloudwatch-extended-stats-check' of https://github.com/apalaniuk/grafana into apalaniuk-update-cloudwatch-extended-stats-check 2018-10-11 12:55:09 -07:00
Torkel Ödegaard a69013c833 Merge pull request #13611 from grafana/remove-user-from-org-and-system
Remove user form org in single org setup improvement
2018-10-11 21:54:07 +02:00
Torkel Ödegaard 69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Torkel Ödegaard c368c72d40 minor ux fix for new select 2018-10-11 12:50:58 -07:00
Torkel Ödegaard b49f4a8c86 Merge pull request #13632 from mrudelle/master
13340 complete oauth doc
2018-10-11 21:30:42 +02:00
Dan Cech 19b69a82af fmt 2018-10-11 15:26:06 -04:00
Matthieu Rudelle 3aef519cdc grafana/grafana#13340 complete oauth doc 2018-10-11 21:22:02 +02:00
Torkel Ödegaard b671b9704f changed property name to UserWasDeleted and added an assert for it 2018-10-11 12:20:53 -07:00
Adam Palaniuk 58a156ba03 Update check for invalid percentile statistics 2018-10-11 14:00:34 -05:00
Mario Trangoni 9c44c75936 pkg/services/alerting/notifiers/telegram.go: check error before close.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/services/alerting/notifiers/telegram.go:130:2⚠️ should check returned error before deferring imageFile.Close() (SA5001) (megacheck)
2018-10-11 19:51:54 +02:00
Mario Trangoni 18e127db2a pkg/tsdb/*: Fix do not pass a nil Context
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/mssql/mssql_test.go:695:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:772:32⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:704:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-11 19:03:54 +02:00
Marcus Efraimsson bcdda7b9ad devenv: fix influxdb block 2018-10-11 17:17:10 +02:00
Marcus Efraimsson 90f6817f6f docs: refer to v5.3 instead of v5.2 2018-10-11 16:36:28 +02:00
Marcus Efraimsson ff5e4e2885 Merge pull request #13618 from grafana/stackdriver-docs-update
stackdriver docs: metric query editor and annotations
2018-10-11 16:25:23 +02:00
Peter Holmberg 6a35eda862 removed unsused function 2018-10-11 15:55:33 +02:00
Daniel Lee 03fefd7bea docs: stackdriver fixes after review
- index page datasource order changed
- image links changed to the image box format
- incorrect sentence fixed
2018-10-11 15:42:47 +02:00
Peter Holmberg 8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Erik Sundell c84cf1f598 stackdriver: check if array is empty to prevent filter from crashing. This closes #13607 2018-10-11 15:10:47 +02:00
Johannes Schill 7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00
Daniel Lee 9f660a7b18 stackdriver docs: metric query editor and annotations 2018-10-11 14:42:34 +02:00
Torkel Ödegaard b7599212e0 Merge pull request #13620 from grafana/frontend-extensions
Frontend extensions
2018-10-11 14:41:11 +02:00
Johannes Schill 2787284033 Update snapshots after merge 2018-10-11 14:01:13 +02:00
Leonard Gram d360d8cebc Requests for ds via backend blocked for users without permissions. 2018-10-11 13:52:23 +02:00
Leonard Gram ec9ed5c830 Removes unused code. 2018-10-11 13:52:23 +02:00
Johannes Schill dc9e822cc7 Remove CTA when CTA-action is clicked instead of a /new route #13471 2018-10-11 13:52:09 +02:00
Carlos Mondragon b121700103 Add fancy delete button for ApiKeys. 2018-10-11 13:50:54 +02:00
Carlos Mondragon 5f5840b24c Add form to both the CTA page and the regular list. 2018-10-11 13:50:53 +02:00
Carlos Mondragon 0937335f14 Add onClick handler to CTA. 2018-10-11 13:50:53 +02:00
Carlos Mondragon af985743d2 Updated tests for new protip. 2018-10-11 13:50:53 +02:00
Carlos Mondragon 081cb7a695 Updated protip, not sure what to write there. 2018-10-11 13:50:53 +02:00
Carlos Mondragon f03fa364df Update tests for ApiKeys CTA screen. 2018-10-11 13:50:53 +02:00
Marcus Efraimsson db1325cc24 changelog: add notes about closing #13616
[skip ci]
2018-10-11 13:49:50 +02:00
Carlos Mondragon d2573a6bc8 Show CTA if there are no ApiKeys, otherwise show table. 2018-10-11 13:48:15 +02:00
Marcus Efraimsson 776b14f7bb Merge pull request #13617 from grafana/13616_phantomjs_legend
fix phantomjs render of graph panel when legend displayed as table to the right
2018-10-11 13:47:34 +02:00
Carlos Mondragon 0bf2d5ebcd Extract ApiKeyCount from state. 2018-10-11 13:31:52 +02:00
Torkel Ödegaard 795b0ca90f Merge pull request #13619 from grafana/13591/loading-indicators-config-pages
Adding loading spinner to org pages
2018-10-11 13:02:47 +02:00
Torkel Ödegaard abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
Peter Holmberg 02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Marcus Efraimsson fc79ba30ae fix phantomjs render of graph panel when legend as table to the right 2018-10-11 11:46:07 +02:00
Marcus Efraimsson 026463f902 changelog: add notes about closing #13172
[skip ci]
2018-10-11 10:26:13 +02:00
Marcus Efraimsson 1b32ff5795 Merge pull request #13609 from Yukinoshita-Yukino/master
elasticsearch: fix no limit size in terms aggregation for alerting queries
2018-10-11 10:21:58 +02:00
Yuan Liu 18dfdc4f0d add test for es alert when group by has no limit 2018-10-11 16:04:57 +08:00
Torkel Ödegaard 5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +02:00
Torkel Ödegaard 9585dc7825 added the UserWasRemoved flag to make api aware of what happened to return correct message to UI 2018-10-11 07:58:22 +02:00
Torkel Ödegaard 5b5cb6622d Remove user form org now completely removes the user from the system if the user is orphaned 2018-10-11 07:48:35 +02:00
Yuan Liu f8a8b213f9 remove tab 2018-10-11 11:40:23 +08:00
Yuan Liu 567db87c3a bug fix
bug fix
2018-10-11 11:36:40 +08:00
Yuan Liu 3b9ab6e204 Update time_series_query.go
fix alert no data when elasticsearch group by terms size is set to no limit
2018-10-11 11:21:06 +08:00
Marcus Efraimsson 974eddee8f changelog: add notes about closing #11711
[skip ci]
2018-10-10 19:24:13 +02:00
Marcus Efraimsson bc3b7357bd Merge pull request #13400 from connection-reset/concurrent-sql
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection 
lifetime configurable in the data source settings
2018-10-10 19:12:38 +02:00
Dan Cech a4f90fd10d add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Marcus Efraimsson 4757ca2242 docs: add version notes 2018-10-10 18:59:09 +02:00
Torkel Ödegaard 39b25e0596 Merge pull request #13536 from grafana/davkal/explore-text-match
Explore: highlight typed text in suggestions
2018-10-10 18:50:14 +02:00
Peter Holmberg 3ca9c10fe4 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 17:05:22 +02:00
Peter Holmberg 037e9ad0bd tests 2018-10-10 17:04:48 +02:00
Johannes Schill a42227cdff Css fix for selected option 2018-10-10 16:21:08 +02:00
Leonard Gram 721dd532e4 User without permission to a datasource won't see it. 2018-10-10 15:55:16 +02:00
Johannes Schill 127b7d92f8 Merge branch '13425-team-picker-bug' of https://github.com/grafana/grafana into 13425-team-picker-bug 2018-10-10 15:05:04 +02:00
Johannes Schill 9a8a476776 Updated test snapshot #13425 2018-10-10 15:02:13 +02:00
Peter Holmberg 707446170d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 14:58:18 +02:00
David Kaltschmidt dcee0771ad Initialize Explore datasource correctly 2018-10-10 14:55:41 +02:00
Leonard Gram ccfcf02e33 Refactors ds permissions to a filter. 2018-10-10 14:25:57 +02:00
Johannes Schill 501d974eaa Remove the fixed widths and make it possible to pass it in as a prop instead #13425 2018-10-10 14:15:28 +02:00
Johannes Schill 77d06a0924 User filtering now works properly at the backend #13425 2018-10-10 14:15:28 +02:00
Johannes Schill 779691a072 Removed old code #13425 2018-10-10 14:15:28 +02:00
Johannes Schill ffae3e7a58 Rename css class "gf-form-select2" to "gf-form-select-box" #13425 2018-10-10 14:15:28 +02:00
Johannes Schill 9afcef985c Use new class names #13425 2018-10-10 14:15:28 +02:00
Johannes Schill e20fa1ba70 Fixes for the tag filtering in the search #13425 2018-10-10 14:15:28 +02:00
Johannes Schill 4d2be024f4 Start implementing the upgraded react-select in the tag filter box #13425 2018-10-10 14:15:28 +02:00
Marcus Efraimsson c0b7ca3902 fix /api/org/users so that query and limit querystrings works 2018-10-10 14:15:28 +02:00
Johannes Schill a94c1eaf4b Bump grafana/build-container to 1.2.0 2018-10-10 14:15:27 +02:00
Johannes Schill 314b8b8ed9 Revert "Lock down node version to see if we get rid of the circleci build issue"
This reverts commit 9080b2c4ff9cff9a1ca99c983051fb35a0789515.
2018-10-10 14:15:27 +02:00
Johannes Schill a1853d782d Revert "Try to remove circleci cache to see if that solves the build issue"
This reverts commit f19fc935918721a29fe149fec8abfb78866b262f.
2018-10-10 14:15:27 +02:00
Johannes Schill 1f27f90cbe Try to remove circleci cache to see if that solves the build issue 2018-10-10 14:15:27 +02:00
Johannes Schill a6fdbad2bb Generate yarn.lock from older yarn 2018-10-10 14:15:27 +02:00
Johannes Schill c695bbfa25 Revert "Add node version output for debugging"
This reverts commit 16a931d535d02a2759e26c2ae3dc66454aa4fe89.
2018-10-10 14:15:27 +02:00
Johannes Schill 118c3b1746 Add node version output for debugging 2018-10-10 14:15:27 +02:00
Johannes Schill 878433bcfa Lock down node version to see if we get rid of the circleci build issue 2018-10-10 14:15:27 +02:00
Johannes Schill 8620804b9f Lock down webpack to 4.19.1 to avoid issue with webpack-cli (https://github.com/webpack/webpack/issues/8082) 2018-10-10 14:15:27 +02:00
Johannes Schill 67d77e6061 Bump react-select to 2.1.0 #13425 2018-10-10 14:15:27 +02:00
Johannes Schill b28008cb5c Updated lockfile to get rid of build error #13425 2018-10-10 14:15:26 +02:00
Johannes Schill 5c842f3ed3 Add frontend filtering of users in user picker #13425 2018-10-10 14:15:26 +02:00
Johannes Schill e5e7611547 Replace $white with a color working in both themes #13425 2018-10-10 14:15:26 +02:00
Johannes Schill f552a7a421 Replace System.import() with import() to get rid of warning 2018-10-10 14:15:26 +02:00
Johannes Schill cc20b8de36 Clean up css for react-select v2 #13425 2018-10-10 14:15:26 +02:00
Johannes Schill be7ed3ebca Upgrade Datasources-picker on Explore page #13425 2018-10-10 14:15:26 +02:00
Johannes Schill 52b329562d Enable trailing on the debounce in the TeamPicker (same as in UserPicker) #13425 2018-10-10 14:15:26 +02:00
Johannes Schill a29d80df4e Update typescript notifications #13425 2018-10-10 14:15:26 +02:00
Johannes Schill 2d65845bac Update (js-) tests and snapshots for react-select 2 #13425 2018-10-10 14:15:25 +02:00
Johannes Schill 7e7c7fe64c Remove variables not used #13425 2018-10-10 14:15:25 +02:00
Johannes Schill 087ff2fa74 wip: Remove code for old react-select component #13425 2018-10-10 14:15:25 +02:00
Johannes Schill d703b8062f wip: The pickers are stateful nowadays, no need to pass in the current value #13425 2018-10-10 14:15:25 +02:00
Johannes Schill d9434ba1b1 wip: Upgrade react-select #13425 2018-10-10 14:15:25 +02:00
bergquist cecf87571f set v5.3 as root docs 2018-10-10 14:00:51 +02:00
Daniel Lee 76ea12b5b0 Merge pull request #13403 from grafana/5.3-release-post
wip: whats new for 5.3
2018-10-10 13:58:32 +02:00
Peter Holmberg 8583788119 disable permissions 2018-10-10 13:50:42 +02:00
Daniel Lee 0a64f0bdc7 whatsnew: adds image for Stackdriver
Plus a few tweaks to the text
2018-10-10 13:46:10 +02:00
Daniel Lee 8b5d03096d Merge pull request #13587 from grafana/nikoalch-patch-4
Update mac.md
2018-10-10 13:35:19 +02:00
Peter Holmberg 83480a1de6 fixing weird arrow in select 2018-10-10 13:28:48 +02:00
bergquist 62d23e3f8d update latest.json to 5.3.0 2018-10-10 13:20:06 +02:00
bergquist 37032a435d changelog: set date for 5.3.0 release 2018-10-10 13:06:29 +02:00
Daniel Lee 7bbd303c23 Merge pull request #13586 from grafana/nikoalch-patch-3
Update windows.md
2018-10-10 11:54:52 +02:00
Daniel Lee 7c2efbac0d Merge pull request #13585 from grafana/nikoalch-patch-2
Update rpm.md
2018-10-10 11:54:20 +02:00
Peter Holmberg f150f35112 fixing permission rows 2018-10-10 11:22:08 +02:00
Marcus Efraimsson baa91ce471 changelog: add notes about closing #13575
[skip ci]
2018-10-10 10:52:43 +02:00
Peter Holmberg 8ed5594dbc enable permissions for data source 2018-10-10 10:39:48 +02:00
Erik Sundell ae44a6b6e9 Use correct naming convention 2018-10-10 10:39:10 +02:00
Erik Sundell 840a6e45da Fix typo 2018-10-10 10:02:13 +02:00
Erik Sundell 939be51496 Provide more information about what's included in the Stackdriver plugin 2018-10-10 09:57:43 +02:00
Marcus Efraimsson 6eb4633dfe changelog: add notes about closing #13575
[skip ci]
2018-10-10 09:54:49 +02:00
Marcus Efraimsson 5f69854e2a Merge pull request #13571 from mtanda/cw_unit
cloudwatch: automatically set graph yaxis unit 

fixes #13575
2018-10-10 09:52:10 +02:00
Marcus Efraimsson 0612ce9b75 cloudwatch: return early if execute query returns error
This will stop a segfault from happening
2018-10-10 09:38:42 +02:00
Torkel Ödegaard ee1d4ce0e2 fix tab switching 2018-10-10 09:26:17 +02:00
Torkel Ödegaard b91c410134 Merge pull request #13568 from praveensastry/render-drag-handle-only-edit-mode
Render Dashboard Row drag handle only in edit mode
2018-10-10 09:01:45 +02:00
Daniel Lee aff752e7f0 Merge pull request #13583 from mtanda/cw_fix_id_validation
fix CloudWatch id validation
2018-10-10 08:44:06 +02:00
Daniel Lee bbd5e19a34 Merge pull request #13584 from grafana/nikoalch-patch-1
Update debian.md
2018-10-10 08:34:33 +02:00
Mitsuhiro Tanda f0fb8123ae add test for automatically unit set 2018-10-10 14:07:08 +09:00
Mitsuhiro Tanda 37e749f6da fix crach bug 2018-10-10 13:56:58 +09:00
Mitsuhiro Tanda 6e32c9bb3f fix id validation 2018-10-10 12:19:57 +09:00
praveensastry 1093f9da7e refactoring after review comments 2018-10-10 09:57:37 +11:00
Daniel Lee d50ed30c15 changelog: adds note for #13559 2018-10-09 21:01:16 +02:00
Daniel Lee a1d4675169 Merge pull request #13490 from mtanda/stackdriver_distribution
Stackdriver heatmap support. Fixes #13559
2018-10-09 20:57:21 +02:00
Torkel Ödegaard 565edc1ed3 added setting top hide plugins in alpha state 2018-10-09 17:47:43 +02:00
Torkel Ödegaard d2bdf8cff1 wip: fixed issues now things are starting to work as before for angular panels 2018-10-09 17:07:13 +02:00
Peter Holmberg 363592a97b pausing permissions list 2018-10-09 16:53:59 +02:00
Jon Ferreira be64af168b Block graph queries from being queued until annotation datasource promises resolve 2018-10-09 10:27:26 -04:00
Peter Holmberg a810bed2f5 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-09 16:06:04 +02:00
Peter Holmberg d71ae7bd4d Redone with DataSourcePermissions 2018-10-09 16:05:40 +02:00
Marcus Efraimsson 17a5e32f23 remove datasource permission admin for now 2018-10-09 15:23:28 +02:00
Peter Holmberg 78b56dd528 reverted AddPermissions 2018-10-09 14:50:46 +02:00
Carl Bergquist 8962ca81a6 Merge pull request #13574 from grafana/update-stackdriver-provisioning-docs
Improve Stackdriver provisioning docs
2018-10-09 12:39:13 +02:00
David Kaltschmidt 76a3b1a793 Explore: highlight typed text in suggestions
- use react-highlight-words
- add highlighting (color and border) to the matching substring of the
  suggested items in the typeahead
- extracted match finding from logging datasource
- created new utils/text.ts class for text-related functions
- added more types
2018-10-09 12:33:25 +02:00
Antoine Cordier 6bab602ecc Update provisioning.md (#13572) 2018-10-09 12:24:23 +02:00
Erik Sundell 1a838ce75d stackdriver: update docs, showing how to escape private key and use yaml multiline strings 2018-10-09 11:40:07 +02:00
Peter Holmberg ac6bee621c modified AddPermissions component 2018-10-09 11:07:23 +02:00
Mitsuhiro Tanda 6ed1cbd5bb set unit for CloudWatch GetMetricStatistics result 2018-10-09 17:02:56 +09:00
David c1164f5c00 Merge pull request #13570 from praveensastry/skip-duplicate-labels
Remove duplicate labels in the datasource query
2018-10-09 07:40:44 +02:00
praveensastry 61bbe280ed Remove duplicate labels in the datasource query 2018-10-09 15:34:58 +11:00
praveensastry b74e76298f render drag handle only in edit mode 2018-10-09 13:40:17 +11:00
Daniel Lee c1fd2e5534 Merge pull request #13550 from grafana/stackdriver-query-help-css
ux: minor update to look of stackdriver query help
2018-10-08 23:39:18 +02:00
Torkel Ödegaard 3fa83d2755 ux: minor update to look of stackdriver query help 2018-10-08 23:29:29 +02:00
Daniel Lee 6599279f41 changelog: adds note for #13495 2018-10-08 23:21:10 +02:00
Dan Cech d20b15834f add gopkg.in/square/go-jose.v2 to dependencies, update github.com/hashicorp/yamux 2018-10-08 17:11:24 -04:00
David 352961b3d7 Merge pull request #13540 from grafana/davkal/explore-compact-url-state
Explore: compact state URLs
2018-10-08 19:25:56 +02:00
David 6fcc062bda Merge pull request #13541 from grafana/davkal/13535-fix-syntax-reload
Explore: trigger a query field render to fix highlighting
2018-10-08 19:25:40 +02:00
David 4a85d012e1 Merge pull request #13542 from grafana/davkal/13531-fix-default-suggestions
Explore: do not show default suggestions after expressions
2018-10-08 19:25:18 +02:00
Daniel Lee 98071ccd17 Merge pull request #13496 from grafana/stackdriver-filter-wildcards
Stackdriver filter wildcards
2018-10-08 16:52:58 +02:00
Daniel Lee 562f62a763 Merge pull request #13564 from grafana/13562-stackdriver-undefined-name
stackdriver metric name fix. Fixes #13562
2018-10-08 16:31:29 +02:00
Peter Holmberg 87793ea30d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-08 16:07:15 +02:00
Peter Holmberg b283845e4e adding permissions component 2018-10-08 16:05:37 +02:00
Marcus Efraimsson 2b812b8825 Merge branch 'noop-services-poc' into data-source-instance-to-react 2018-10-08 16:04:21 +02:00
Marcus Efraimsson 4d719b0d05 Merge remote-tracking branch 'origin/master' into noop-services-poc 2018-10-08 16:02:44 +02:00
Peter Holmberg 61cac5fd61 reverted back and using angular for settings and dashboards 2018-10-08 16:01:17 +02:00
Erik Sundell 11b9f9691c stackdriver: improve filter docs for wildcards and regular expressions 2018-10-08 15:57:31 +02:00
Erik Sundell 8d53799bcd stackdriver: always use regex full match for =~ and !=~operator 2018-10-08 15:57:31 +02:00
Erik Sundell 7e6a5c0a74 stackdriver: add tests from regex matching 2018-10-08 15:57:30 +02:00
Erik Sundell 46ca306c2f stackdriver: always use regex full match for =~ and !=~operator 2018-10-08 15:57:30 +02:00
Erik Sundell a3122a4b85 stackdriver: test build filter string 2018-10-08 15:57:30 +02:00
Erik Sundell 5f7795aa1f stackdriver: test that no interpolation is done when there are no wildcards 2018-10-08 15:57:30 +02:00
Erik Sundell 2a0d7a8803 stackdriver: remove debug logging 2018-10-08 15:57:30 +02:00
Erik Sundell 035be6cbbe stackdriver: add more tests 2018-10-08 15:57:30 +02:00
Erik Sundell 68332c5951 stackdriver: fix broken substring. also adds tests 2018-10-08 15:57:30 +02:00
Erik Sundell 2e665fba0f stackdriver: remove not necessary helper functions 2018-10-08 15:57:30 +02:00
Erik Sundell 4d8f594d31 stackdriver: interpolate stackdriver filter wildcards when asterix is used in filter 2018-10-08 15:57:30 +02:00
Daniel Lee 6fce178ec7 stackdriver metric name fix. Fixes #13562
Sets metric name even when the metric does not have a displayName field. Closes #13562.
2018-10-08 15:34:28 +02:00
Peter Holmberg 4ecd33c79c Fixed nav model 2018-10-08 14:09:02 +02:00
Torkel Ödegaard ed349075a0 Merge pull request #13556 from grafana/influxdb-annotation-fix
fix for influxdb annotation issue that caused text to be shown twice
2018-10-08 09:29:21 +02:00
Torkel Ödegaard 67f5bb2c4e fix for influxdb annotation issue that caused text to be shown twice, fixes #13553 2018-10-08 09:19:48 +02:00
Torkel Ödegaard 2f84101fe7 wip: restoring old angular panel tabs / edit mode 2018-10-07 10:39:47 -07:00
Torkel Ödegaard 07eba60e24 Merge pull request #13537 from grafana/new-data-source-as-separate-page
New data source as separate page
2018-10-06 20:42:13 +02:00
Torkel Ödegaard 9346ee006c Merge pull request #13547 from ceh-forks/docs-typos
docs: fix minor typos
2018-10-06 20:40:21 +02:00
Torkel Ödegaard b411e8eb25 Merge pull request #13548 from neufeldtech/playlist_fix
Fix text overflow on playlist search  #13464
2018-10-06 20:39:42 +02:00
Torkel Ödegaard 2e4a1f317d ux: final fixes to new datasource page 2018-10-06 19:22:16 +02:00
Jordan Neufeld 4815f92f6f Fix text overflow on playlist search #13464 2018-10-06 10:17:26 -05:00
Emil Hessman 69cf131f81 docs: fix minor typos 2018-10-06 17:09:41 +02:00
Torkel Ödegaard 3c6a6e69a6 Merge pull request #13538 from narqo/circleci-fix-gofmt-test
fix gofmt tests output
2018-10-06 08:47:58 +02:00
Daniel Lee f4f97d2e65 Merge pull request #13543 from jodli/patch-1
Fixed typo in query editor placeholder text.
2018-10-06 00:01:03 +02:00
Torkel Ödegaard 8e2859625f ux: more minor ds setting tweaks 2018-10-05 13:13:04 -07:00
Torkel Ödegaard 4f852bb4ae ux: more minor ds setting tweaks 2018-10-05 13:09:41 -07:00
Torkel Ödegaard 2860a50065 ux: tweaks to add datasource page and datasource settings page 2018-10-05 12:55:34 -07:00
Jan-Olaf Becker 82aa0a3674 Fixed typo in query editor placeholder text. 2018-10-05 20:41:48 +02:00
David Kaltschmidt 6260a6d2f3 Explore: do not show default suggestions after expressions
- an expression ends on closing braces
- exclude expressions from the default/empty suggestions
2018-10-05 18:51:49 +02:00
David Kaltschmidt e0b8b1b7af Explore: trigger a query field render to fix highlighting
- some syntax rules are loaded asynchronously
- when they have been received, the query field needs to re-render
- trigger re-render via bogus edit (tried other methods but could not
  find any)
2018-10-05 18:27:33 +02:00
David Kaltschmidt 5ec9adb7a7 Explore: compact state URLs
- allow positional state array in URL
- key-based parsing as fallback
- fix issue where split state was kept in URL after closing split
2018-10-05 17:09:40 +02:00
David f6d332562a Merge pull request #13529 from grafana/davkal/13517-resize-graph
Explore: resize graph on window resize
2018-10-05 16:14:25 +02:00
Vladimir Varankin f5e81e45cc fix gofmt tests output
Print the whole command in "Execute ..." and "... returned 1" logs.
Fix "binary operator expected" by passing quoted output from
`gofmt` to `test`.
2018-10-05 14:42:25 +02:00
Peter Holmberg e1c77f634d Merge branch 'master' into new-data-source-as-separate-page 2018-10-05 13:15:26 +02:00
Peter Holmberg 841ca49942 removed duplicate route 2018-10-05 13:09:06 +02:00
David Kaltschmidt 64af094204 Use size-me to resize explore Graph, added types 2018-10-05 11:39:00 +02:00
Peter Holmberg b5681e9802 algorithm to find new name if it exists 2018-10-05 11:33:41 +02:00
Torkel Ödegaard 61d64c41fc Merge pull request #13534 from grafana/misc-react-migration-fixes
ux: misc react migration fixes and info box style improvement
2018-10-05 09:55:39 +02:00
Torkel Ödegaard 848f19a4a1 ux: misc react migration fixes and info box style improvement 2018-10-05 08:43:56 +02:00
Marcus Efraimsson c670897c6a docs: new variable type text box that allows free text input 2018-10-04 18:45:47 +02:00
Marcus Efraimsson b03a25198b docs: annotations tag filter with template variable support 2018-10-04 18:25:16 +02:00
Torkel Ödegaard 1da352822a Merge pull request #13530 from grafana/davkal/13485-cursor-suggestions
Explore: reset typeahead on cursor move
2018-10-04 18:05:32 +02:00
David 5aa91fc1c5 Merge pull request #13528 from grafana/davkal/fix-rate-hint
Explore: fix rate hint for series with null values
2018-10-04 17:51:05 +02:00
Daniel Lee a44e8c5917 docs: whats new in 5.3 - a few tweaks 2018-10-04 17:46:16 +02:00
Marcus Efraimsson 79929c1f00 mysql: note about connection max lifetime and wait_timeout 2018-10-04 17:42:34 +02:00
David Kaltschmidt a0b21db053 Explore: reset typeahead on cursor move 2018-10-04 17:25:31 +02:00
David Kaltschmidt 5cb9dc99ca Explore: resize graph on window resize 2018-10-04 16:56:54 +02:00
David Kaltschmidt 107bef2d6d Fix rate function hint for series with nulls 2018-10-04 16:32:32 +02:00
David b0172427b1 Extract query hints 2018-10-04 16:27:18 +02:00
David 1a6b0adbd7 Merge pull request #13525 from grafana/davkal/contributing.md
Moving contributing.md to top level
2018-10-04 15:50:23 +02:00
David 406b6144a5 Merge pull request #13491 from grafana/davkal/explore-perf
Explore: typeahead and render performance improvements
2018-10-04 15:48:08 +02:00
David Kaltschmidt bdae399322 Prevent Explore from updating when typing query
- remove `edited` property of query objects
- query object semantics changes to be initial values only
- resetting or externally modifying a query is done via giving it a new
  react key, which replaces the row completely
- query changes while typing are sent up to Explore to be saved in a
  local property that is not part of the component state (prevent
  control circle)
- all Explore functions using the queries must access the local property
  for current values
2018-10-04 15:32:28 +02:00
David Kaltschmidt dc4b0cf2ca Avoid new metrics options being passed selector, made PromField pure 2018-10-04 15:28:33 +02:00
David Kaltschmidt 538ea1127e Perf on query field and typeahead
- Lower debounce
- refactor suggestion selection
- make Portal pure
- use prev suggestions object if suggestions are the same
2018-10-04 15:28:33 +02:00
David Kaltschmidt 9914071cc0 Dont rebuild datasource options on each render 2018-10-04 15:28:32 +02:00
Marcus Efraimsson 9ae6f68500 Merge pull request #13498 from svenklemm/sql-macros2
move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine
2018-10-04 15:21:46 +02:00
David Kaltschmidt c1786ae753 contributing.md 2018-10-04 15:20:55 +02:00
Marcus Efraimsson 3ed4defc91 changelog: add notes about closing #13326
[skip ci]
2018-10-04 15:15:01 +02:00
Marcus Efraimsson 2b1e4d001a Merge pull request #13326 from ryantxu/proxy-slash
Keep trailing slash for datasource proxy requests
2018-10-04 14:38:34 +02:00
Torkel Ödegaard 0aa0ae0eb1 react-2-angular: added generic angular directive loader util that can be used from react 2018-10-04 13:02:29 +02:00
Peter Holmberg 85603dbc21 search data source types 2018-10-04 11:42:17 +02:00
Torkel Ödegaard b7ba73819c mini fix 2018-10-04 09:14:47 +02:00
Torkel Ödegaard dcb7f0d492 Merge branch 'master' into react-panels-ux-idea2 2018-10-04 09:08:19 +02:00
Torkel Ödegaard 019d0ee179 Merge pull request #13506 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-03 20:10:01 +02:00
Torkel Ödegaard 30eda62fe7 css: minor fix to search 2018-10-03 11:07:20 -07:00
Torkel Ödegaard 31d4cf9aff Merge pull request #13514 from grafana/13441-center-search-item
centered dashboard icon in search with flexbox
2018-10-03 20:03:41 +02:00
bergquist 81824370db bump master version to 5.4.0-pre1 2018-10-03 17:38:52 +02:00
bergquist 4498d75b17 provisioning: adds more logging about failed to deletion of provisioned dashboards 2018-10-03 17:38:10 +02:00
Marcus Efraimsson d2dc770c79 various fixes and improvements 2018-10-03 17:10:41 +02:00
bergquist 75ed71a455 changelog: set date for 5.3.0-beta3 release 2018-10-03 16:48:07 +02:00
bergquist 96a0c9c56d build: fix for invalid pathing for release publisher 2018-10-03 16:47:37 +02:00
bergquist 00b4c175c6 changlog: adds note about closing #13551 and #13507 2018-10-03 16:30:26 +02:00
Marcus Efraimsson 30fca2b181 Merge remote-tracking branch 'origin/master' into 5.3-release-post 2018-10-03 16:25:44 +02:00
Peter Holmberg 262fee0a42 new grid layout add data source 2018-10-03 16:04:30 +02:00
Daniel Lee d6ba90815d Merge pull request #13511 from grafana/stackdriver-nginject-fix
stackdriver: adds missing nginject attribute
2018-10-03 15:09:26 +02:00
Torkel Ödegaard a83f0e9ba2 test: updated react snapshot 2018-10-03 14:58:34 +02:00
Torkel Ödegaard 81c44eb312 Merge branch 'revert-13502-revert-13488-org-users-to-react' 2018-10-03 14:52:50 +02:00
Torkel Ödegaard 9b4dd31095 ux: minor tweak to link 2018-10-03 14:52:13 +02:00
Daniel Lee 6d8a3ce1a3 stackdriver: adds missing nginject attribute 2018-10-03 14:42:41 +02:00
Carl Bergquist f35fd0c5a3 Merge pull request #13509 from grafana/13507-permissions-on-role-fix
Fix issue with updating role permissions #13507
2018-10-03 14:20:12 +02:00
Carl Bergquist 99f2342fa1 Merge pull request #13508 from grafana/release_publisher
build: automatically publish releases to grafana.com.
2018-10-03 14:10:17 +02:00
Leonard Gram 00843037d4 docs: better wording and docs links. 2018-10-03 13:56:43 +02:00
Johannes Schill 97802f30ae Fix issue with updating role permissions #13507 2018-10-03 13:37:00 +02:00
Peter Holmberg ef5180bae0 fixed toggle buttons 2018-10-03 13:04:31 +02:00
Marcus Efraimsson 3fa8088192 dataproxy should forward a trailing slash to proxy 2018-10-03 12:55:01 +02:00
Marcus Efraimsson 8bf4d68035 add datasource proxy test to verify trailing slashes are forwarded 2018-10-03 12:28:30 +02:00
Patrick O'Carroll 9c889f8d68 centered dashboard icon in search with flexbox 2018-10-03 11:42:18 +02:00
Marcus Efraimsson 6407ec4128 mssql: fix tests 2018-10-03 11:26:52 +02:00
bergquist add6cee742 build: automatically publish releases to grafana.com. 2018-10-03 11:17:46 +02:00
Peter Holmberg 45113e6c8b updated after pr feedback 2018-10-03 10:54:15 +02:00
Mario Trangoni afab9085eb pkg/tsdb/postgres/postgres_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/postgres/postgres_test.go:120:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:200:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:257:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:282:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:336:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:363:32⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:453:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:475:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:497:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:519:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:541:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:563:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:585:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:607:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:629:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:652:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:677:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:738:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:761:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:787:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:817:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:847:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:877:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:905:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:933:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:32:51 +02:00
Mario Trangoni 3632e9c756 pkg/tsdb/mysql/mysql_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/mysql/mysql_test.go:132:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:220:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:267:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:330:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:355:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:381:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:476:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:498:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:520:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:542:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:564:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:586:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:608:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:630:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:652:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:674:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:696:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:719:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:744:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:805:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:828:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:854:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:884:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:914:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:944:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:972:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:1000:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:24:06 +02:00
Mario Trangoni 0f25dec117 pkg/tsdb/mssql/mssql_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/mssql/mssql_test.go:131:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:221:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:268:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:330:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:355:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:444:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:466:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:488:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:510:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:532:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:554:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:576:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:598:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:620:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:643:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:666:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:742:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:819:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:895:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:918:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:944:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:974:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1004:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1034:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1062:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1090:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:22:26 +02:00
Sven Klemm e303468c0c adjust mssql tests 2018-10-03 10:21:16 +02:00
Mario Trangoni 88efb87b0d pkg/tsdb/elasticsearch/client/client_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/elasticsearch/client/client_test.go:28:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:39:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:51:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:63:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:76:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:89:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 09:59:10 +02:00
Peter Holmberg 44f2041cf3 added data source type type 2018-10-03 09:56:15 +02:00
Mario Trangoni d1e1fb7e72 pkg/services/alerting/notifiers/telegram_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/services/alerting/notifiers/telegram_test.go:55:44⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:71:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:88:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:104:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 09:47:54 +02:00
Sven Klemm af22213462 remove generic macros from macros_test and add integration test for generic macros 2018-10-03 09:46:17 +02:00
Torkel Ödegaard afdec3d1b0 Revert "Revert "Org users to react"" 2018-10-03 09:43:10 +02:00
Torkel Ödegaard d59c86ccbb Merge pull request #13502 from grafana/revert-13488-org-users-to-react
Revert "Org users to react"
2018-10-03 09:43:05 +02:00
Torkel Ödegaard fe4f2f71c3 Revert "Org users to react" 2018-10-03 09:40:37 +02:00
Sven Klemm 744e8617ff add postgres test for global macros 2018-10-03 09:35:42 +02:00
Torkel Ödegaard 38637f056f Merge pull request #13488 from grafana/org-users-to-react
Org users to react
2018-10-03 09:30:08 +02:00
Mitsuhiro Tanda c2c0cdb49c add test 2018-10-03 16:27:11 +09:00
Mitsuhiro Tanda 6770f2e940 stackdriver heatmap support 2018-10-03 16:27:04 +09:00
Torkel Ödegaard c3a8dd28d5 Merge pull request #13500 from grafana/testdata-tables
Testdata tables
2018-10-03 08:54:08 +02:00
Torkel Ödegaard ed0c2296b6 added slow queries scenario to test data source, added new panel test dashboard with slow queries 2018-10-02 13:00:54 -07:00
Torkel Ödegaard 4a77a62949 Merge pull request #13499 from dadosch/patch-1
Update configuration doc to include socket at [server]
2018-10-02 21:38:08 +02:00
dadosch 2500fe27f1 Fix "appropriate"-typo 2018-10-02 19:20:48 +00:00
dadosch b138ae9d4c Update configuration doc to include socket@server
`protocol=socket` and `socket=` path in [server]

fixes https://github.com/grafana/grafana/issues/8701
2018-10-02 18:59:55 +00:00
Sven Klemm 94d6d51726 move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine 2018-10-02 20:19:34 +02:00
Torkel Ödegaard 9e72588cec wip: began work on support for testdata tables & annotations support 2018-10-02 18:50:30 +02:00
Marcus Efraimsson 3932e4db5a Merge remote-tracking branch 'origin/master' into concurrent-sql 2018-10-02 17:44:33 +02:00
Marcus Efraimsson e5c376aead docs: connection limits for sql datasources 2018-10-02 17:43:54 +02:00
Marcus Efraimsson 12230dfa71 ux: put connection limits under own section 2018-10-02 17:43:15 +02:00
Peter Holmberg a381db3237 fiddling with validation 2018-10-02 16:50:34 +02:00
bergquist 1935497813 changelog: adds note about closing #13492 2018-10-02 16:38:13 +02:00
Peter Holmberg 7a39e5554b view and route 2018-10-02 16:18:42 +02:00
Torkel Ödegaard 6c41cfb72c wip: made sqlstore dialect accessable from outside 2018-10-02 16:14:29 +02:00
Marcus Efraimsson 9af809ff8a Merge pull request #13440 from grafana/reminder_refactoring
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
David 321c09aec4 Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels
Explore: jump to explore from panels with mixed datasources
2018-10-02 15:42:43 +02:00
Marcus Efraimsson 0e0901874b better comment about state changes 2018-10-02 15:11:33 +02:00
Marcus Efraimsson 418f77e70e get or create alert notification should use transaction 2018-10-02 15:07:44 +02:00
bergquist 7b781e4c3c use notification state id instead of notifier id 2018-10-02 14:53:39 +02:00
bergquist 9289cba625 merges defaultShouldNotify and ShouldNotify 2018-10-02 14:28:48 +02:00
bergquist 67e5f62514 move version conflict logging for mark as complete to sqlstore package 2018-10-02 14:23:18 +02:00
Peter Holmberg c3f87b56ee removed duplicate route 2018-10-02 14:13:30 +02:00
bergquist 9d3659d30d improve local variable name 2018-10-02 14:04:50 +02:00
bergquist b45a1bd45c avoid exporting notificationState and notificationStateSlice 2018-10-02 14:03:30 +02:00
bergquist 9022e871e3 avoid sending full notification state to pending/complete 2018-10-02 13:57:41 +02:00
Peter Holmberg 908bf8e834 deleting obsolete things 2018-10-02 13:53:11 +02:00
Axel Pirek dd09ece8c9 Make max open, max idle connections and connection max life time configurable 2018-10-02 13:42:06 +02:00
Peter Holmberg cc57995070 snap 2018-10-02 13:30:09 +02:00
Peter Holmberg 6d6416c04d fix after merge from master 2018-10-02 13:19:11 +02:00
bergquist 341d8af637 rename GetNotificationStateQuery to GetOrCreateNotificationStateQuery 2018-10-02 11:23:40 +02:00
bergquist 7f1d7cefc0 reminder: uses UpdatedAt to track state changes. 2018-10-02 11:19:09 +02:00
Peter Holmberg 09b681326e Merge branch 'master' into org-users-to-react 2018-10-02 11:18:01 +02:00
Peter Holmberg cc1e22925f snaps 2018-10-02 11:11:36 +02:00
Peter Holmberg a188ceacbc invitees 2018-10-02 11:04:55 +02:00
Carl Bergquist 9e09b2b969 Merge pull request #13477 from grafana/alert_rule_state_changes_version
use alert state changes counter for alert notification dedupping.
2018-10-02 10:18:27 +02:00
Torkel Ödegaard f37a60dcd5 Merge branch 'data-sources-list-to-react' 2018-10-02 09:33:58 +02:00
Torkel Ödegaard 8fd1d8a057 changed from RFC to PureComponent 2018-10-02 09:27:02 +02:00
Carl Bergquist 8e9c0a44c3 Merge pull request #13470 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-01 23:14:14 +02:00
Marcus Efraimsson 35eddee2dd devenv: add postgres ha test config example 2018-10-01 19:40:03 +02:00
Marcus Efraimsson 505ae709c9 Merge pull request #13481 from leo8a/master
typo in sample.ini
2018-10-01 19:31:56 +02:00
Torkel Ödegaard 162a95bff9 wip: going in circles 2018-10-01 19:31:03 +02:00
Leo Ochoa 12a99fa0b5 typo in sample.ini 2018-10-01 18:47:25 +02:00
Marcus Efraimsson 4ce8cc77e4 Merge pull request #13480 from ArcticSnowman/master
Update to ldap.md
2018-10-01 18:42:45 +02:00
Mario Trangoni 6c190ab713 pkg/tsdb/cloudwatch/credentials.go: Remove unnecessary variable assignment
See,
pkg/tsdb/cloudwatch/credentials.go:45:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni 236e0b3814 pkg/cmd/grafana-server/main.go: '_ = <-ch' simplified to '<-ch'
See,
pkg/cmd/grafana-server/main.go:107:8⚠️ '_ = <-ch' can be simplified to '<-ch' (S1005) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni ec4139d56b pkg/tsdb/stackdriver/stackdriver_test.go: return simplified
See,
pkg/tsdb/stackdriver/stackdriver_test.go:356:2⚠️ 'if err != nil { return data, err }; return data, nil' can be simplified to 'return data, err'
2018-10-01 18:24:00 +02:00
Mario Trangoni dde650905d Fix megacheck issue unused code.
I removed some code, and commented out other one.

See,
$ gometalinter --vendor --disable-all --disable=gotype --enable=megacheck --deadline 6m ./... | grep unused
pkg/api/avatar/avatar.go:100:26⚠️ func (*CacheServer).mustInt is unused (U1000) (megacheck)
pkg/api/folder_test.go:136:6⚠️ func callGetFolderByUID is unused (U1000) (megacheck)
pkg/api/folder_test.go:141:6⚠️ func callDeleteFolder is unused (U1000) (megacheck)
pkg/api/live/hub.go:40:15⚠️ func (*hub).removeConnection is unused (U1000) (megacheck)
pkg/components/imguploader/azureblobuploader.go:130:5⚠️ var client is unused (U1000) (megacheck)
pkg/middleware/middleware_test.go:438:28⚠️ func (*scenarioContext).withInvalidApiKey is unused (U1000) (megacheck)
pkg/services/alerting/ticker.go:40:18⚠️ func (*Ticker).updateOffset is unused (U1000) (megacheck)
pkg/services/notifications/notifications_test.go:12:6⚠️ type testTriggeredAlert is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:935:6⚠️ type scenarioContext is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:939:6⚠️ type scenarioFunc is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:941:6⚠️ func dashboardGuardianScenario is unused (U1000) (megacheck)
pkg/services/sqlstore/transactions_test.go:13:6⚠️ type testQuery is unused (U1000) (megacheck)
2018-10-01 18:23:59 +02:00
Peter Holmberg 3c8820ab55 invites table 2018-10-01 18:01:26 +02:00
Steven Arnott 043d5f1c05 Update ldap.md 2018-10-01 11:41:19 -04:00
Marcus Efraimsson a4f5aafe22 Merge pull request #13422 from grafana/1815_admin_reset
cli: fix reset-admin-password
2018-10-01 16:48:32 +02:00
bergquist 75f832cda8 use alert state changes counter as secondary version 2018-10-01 15:58:30 +02:00
Torkel Ödegaard b3c78f1265 wip: data source permissions hooks 2018-10-01 15:38:55 +02:00
Leonard Gram b29ac5c509 docs: stackdriver version notice. 2018-10-01 14:35:20 +02:00
Peter Holmberg 13666c8462 tests 2018-10-01 14:17:28 +02:00
Peter Holmberg a43ede70bc added default prop instead of specifying prop 2018-10-01 14:02:13 +02:00
Leonard Gram 28a9caa34d Update CHANGELOG.md 2018-10-01 13:45:34 +02:00
Peter Holmberg 3211df7303 filter users in selector based on search 2018-10-01 13:45:00 +02:00
David Kaltschmidt 68dfc5699b Moved explore helpers to utils/explore 2018-10-01 12:56:26 +02:00
David Kaltschmidt 54c9beb146 Explore: jump to explore from panels with mixed datasources
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
  explore and collects its targets
- passes those targets to the found datasource to be serialized for
  explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
2018-10-01 12:03:57 +02:00
Peter Holmberg 94971abd9c functions and tests 2018-10-01 12:01:53 +02:00
David 7b543ca4b5 Merge pull request #13463 from grafana/davkal/explore-url-state
Explore: Store UI state in URL
2018-10-01 10:09:15 +02:00
Torkel Ödegaard c0996e7a39 Merge pull request #13444 from grafana/13411-react-api-key
13411 react api key
2018-10-01 09:46:18 +02:00
Marcus Efraimsson 1be8fb76b8 cleanup alert_notification_state when deleting alert rules and channels 2018-09-30 21:57:15 +02:00
Marcus Efraimsson 5ec086dc56 don't notify if notification state pending
If notification state is pending and last update of state was made
less than a minute ago. In the case of a grafana instance is shut down/crashes
between setting pending state and before sending the notification/marks as complete
this logic should allow the notification to be sent after some time instead of
being left in an inconsistent state where no notifications are being sent.
2018-09-30 21:52:50 +02:00
Marcus Efraimsson d412aafb7e remove unused code 2018-09-30 20:16:01 +02:00
Daniel Lee bf2abc6940 stackdriver: set default view parameter to FULL 2018-09-29 23:45:28 +02:00
Daniel Lee 9c2bca411c Merge pull request #13289 from grafana/stackdriver-plugin
Stackdriver Datasource - Fixes #6733
2018-09-28 19:36:01 +02:00
Daniel Lee cf0189ab1a stackdriver: no tags for annotations (yet)
fixes glitch where an empty tag shows up
2018-09-28 19:17:34 +02:00
Daniel Lee 296fd35d47 stackdriver: add help section for annotations 2018-09-28 19:12:50 +02:00
Marcus Efraimsson d313ffa847 devenv: enable some debug logging for ha test setup 2018-09-28 18:35:43 +02:00
Marcus Efraimsson 8551ffa0b0 alert -> ok with reminders enabled should send 2018-09-28 18:34:20 +02:00
Daniel Lee a1f486bbfa stackdriver: revert an accidental commit for text template variable
with dummy change in readme to be able to make a commit
2018-09-28 18:19:57 +02:00
David b2758b2ad0 Merge pull request #13408 from grafana/limit-number-of-series-in-explore
Limit number of time series in explore
2018-09-28 17:45:33 +02:00
David Kaltschmidt 12c43d6436 Added test for url state in Explore 2018-09-28 17:39:53 +02:00
David Kaltschmidt c3e0d4205c Make Explore a pure component 2018-09-28 17:38:50 +02:00
Peter Holmberg 8f99276606 first crude display 2018-09-28 17:21:00 +02:00
Daniel Lee 399e83f91b stackdriver: remove metric.category alias pattern
After discussions with the Stackdriver team, they did not think this was
needed.
2018-09-28 17:16:35 +02:00
Erik Sundell a25389332c stackdriver: remove commented code 2018-09-28 17:11:06 +02:00
Erik Sundell db8bbe3cad stackdriver: unit test group by and aggregation dropdown changes 2018-09-28 17:06:24 +02:00
Erik Sundell 3572692fd5 stackdriver: make it impossible to select no aggregation when a group by is selected 2018-09-28 16:55:39 +02:00
David Kaltschmidt 200784ea4a Explore: Store UI state in URL
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
2018-09-28 16:44:07 +02:00
Erik Sundell cdcb14f3e6 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-28 16:37:11 +02:00
Erik Sundell fc1e214987 stackdriver: add relevant error message for when a user tries to create a template variable 2018-09-28 16:36:43 +02:00
Daniel Lee aedd518186 Merge remote-tracking branch 'origin/stackdriver-plugin' into stackdriver-plugin 2018-09-28 16:34:28 +02:00
Erik Sundell 9748a9487b stackdriver: merge commit" 2018-09-28 16:21:54 +02:00
Daniel Lee 9b90b835b2 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-28 16:20:40 +02:00
Erik Sundell 31ddcdb37e stackdriver: make sure labels are loaded when service is changed in dropdown 2018-09-28 16:20:16 +02:00
Daniel Lee d11f67eb25 stackdriver: change info logging to debug logging 2018-09-28 16:16:27 +02:00
Daniel Lee 41060d24d5 stackdriver: change pattern for annotation to metric.value 2018-09-28 16:16:27 +02:00
Erik Sundell 189f89a9e4 stackdriver: add support for bool values 2018-09-28 15:42:02 +02:00
Erik Sundell 220f479ff8 stackdriver: add support for int64 values 2018-09-28 15:27:28 +02:00
Erik Sundell 4abd04a5cf stackdriver: use correct default value for alignment period 2018-09-28 15:23:13 +02:00
Marcus Efraimsson a0e1a1a1f9 Merge remote-tracking branch 'origin/master' into reminder_refactoring 2018-09-28 15:17:30 +02:00
Marcus Efraimsson fda8a08e0b Merge pull request #13439 from grafana/ha_setup
Grafana high availability (ha) test setup
2018-09-28 15:16:47 +02:00
Erik Sundell f384e577dd stackdriver: fix reducer names 2018-09-28 15:11:33 +02:00
Marcus Efraimsson 67c58fa5e4 fix set sent_at on complete 2018-09-28 15:11:03 +02:00
Peter Holmberg da856187d8 snaps 2018-09-28 14:57:56 +02:00
Torkel Ödegaard d2464812eb noop services poc 2018-09-28 14:52:12 +02:00
Peter Holmberg 21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
Marcus Efraimsson c1763508e0 handle pending and completed state for alert notifications 2018-09-28 14:22:03 +02:00
Erik Sundell 2aae7e0c87 stackdriver: fix froamt annotation text for value 2018-09-28 13:50:10 +02:00
Erik Sundell ca50e315fa stackdriver: make it possible to use point values of type string 2018-09-28 13:41:28 +02:00
Peter Holmberg 3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Marcus Efraimsson 2bf399d3c8 No need to get alert notification state in ShouldNotify 2018-09-28 12:59:35 +02:00
Peter Holmberg e50a87aec9 using constant 2018-09-28 12:58:01 +02:00
Peter Holmberg 7ae4076ddd added no datasources added 2018-09-28 11:29:18 +02:00
Erik Sundell 5bc6d857a7 stackdriver: broadcasting through $scope doesnt work anymore since query_filter_ctrl is now a sibling directive to query_aggregation_ctrl, so broadcasting is now done using $rootScope 2018-09-28 11:25:32 +02:00
Marcus Efraimsson 69cc24ea3f wip: test get alert notification state 2018-09-28 11:17:03 +02:00
Marcus Efraimsson 88bbc452a7 wip: send and mark as complete 2018-09-28 11:14:36 +02:00
Peter Holmberg 166f93cf54 components, test, removed old not used files 2018-09-28 11:05:34 +02:00
Leonard Gram 1a75aa54de wip: impl so that get alertstate also creates it if it does not exist 2018-09-28 10:48:08 +02:00
Torkel Ödegaard abefadb333 fix: preloader element issue 2018-09-28 09:30:56 +02:00
Torkel Ödegaard 5eef2fe05b Merge pull request #13458 from skreii/master
Adding AWS Isolated Regions
2018-09-28 09:14:43 +02:00
Steve Kreitzer 55e4db5cfc Adding AWS Isolated Regions 2018-09-27 19:58:07 -04:00
bergquist 15ce474639 wip 2018-09-27 16:21:53 +02:00
Daniel Lee a63877bd4f stackdriver: pattern formatting for annotations 2018-09-27 16:18:48 +02:00
Erik Sundell 9351b56e57 stackdriver: fix alignment period bug 2018-09-27 15:59:17 +02:00
Torkel Ödegaard 5eede26a24 Merge pull request #13438 from grafana/plugin-list-to-react
Plugin list to react
2018-09-27 15:50:55 +02:00
Erik Sundell a028df658a stackdriver: set first metric as selected if no metric could be retrieved from the target 2018-09-27 15:42:01 +02:00
Torkel Ödegaard 8b4dbbe0bd Merge pull request #13448 from grafana/davkal/typecheck-precommit
Compile TS on precommit hook
2018-09-27 15:36:50 +02:00
Daniel Lee 03b43ab769 stackdriver: wip annotation support 2018-09-27 15:18:10 +02:00
David Kaltschmidt 88f36cbd22 Compile TS of the whole project to detect type errors
- was not covered by TS lint
- TS errors are only noticed in broken builds
- added grunt task to run `tsc --noEmit`
2018-09-27 15:15:41 +02:00
Erik Sundell 26d9e9243a stackdriver: resolve merge conflict 2018-09-27 15:14:01 +02:00
Erik Sundell a3b0539754 stackdriver: update tests 2018-09-27 15:05:47 +02:00
Erik Sundell 81bdf86bf8 stackdriver: es6 style directive, avoid using scope 2018-09-27 15:05:26 +02:00
Torkel Ödegaard 5873a71324 Update CHANGELOG.md 2018-09-27 14:58:46 +02:00
Peter Holmberg 11ee65d35a deletez 2018-09-27 14:51:00 +02:00
Torkel Ödegaard 7d44aacf4a refactoring: slight changes to PR #13247 2018-09-27 14:50:14 +02:00
Peter Holmberg b899a0e1c1 revert rename 2018-09-27 14:45:36 +02:00
Erik Sundell 8ae72bce07 stackdriver: fix typescript error 2018-09-27 14:45:15 +02:00
Erik Sundell a7897575b9 stackdriver: remove not needed alignment option 2018-09-27 14:43:30 +02:00
Torkel Ödegaard f2307f92de Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173 2018-09-27 14:36:37 +02:00
Peter Holmberg 327cdf34d5 using constant 2018-09-27 14:32:54 +02:00
Daniel Lee ea1859a374 stackdriver: extract out filter, metric type directive 2018-09-27 14:31:39 +02:00
Erik Sundell 92f50ca384 stackdriver: add unit tests to resolve unit function 2018-09-27 14:24:28 +02:00
Peter Holmberg fede5e6c74 rename to pluginlistitem 2018-09-27 14:23:46 +02:00
Peter Holmberg cabc4c4bfe fixing types 2018-09-27 14:19:36 +02:00
Erik Sundell 251bb09aed stackdriver: convert most common stackdriver units to grafana units if possible 2018-09-27 14:03:52 +02:00
Torkel Ödegaard 92172566cb Merge pull request #13445 from grafana/explore-dark-theme-fixes
fixes to dark theme for Explore mode
2018-09-27 13:43:51 +02:00
Marcus Efraimsson d093244282 sqlstore: add support for checking if error is constraint validation error 2018-09-27 13:38:22 +02:00
Peter Holmberg 1e2c06083a rewrote to use react.sfc 2018-09-27 12:15:41 +02:00
Torkel Ödegaard 5c24fa68a5 explore: fixes to dark theme, fixes #13349 2018-09-27 11:57:28 +02:00
Johannes Schill 362010c438 Remove angular code related to API Keys and point the route to the React component #13411 2018-09-27 11:53:19 +02:00
Johannes Schill c7fb6916b9 Open modal with API key information after key is added #13411 2018-09-27 11:53:19 +02:00
Johannes Schill a94662c8c7 Add tests for the reducers & selectors for API keys #13411 2018-09-27 11:53:19 +02:00
Johannes Schill 32fb24f248 Update test-snapshot, remove dead code #13411 2018-09-27 11:53:19 +02:00
Johannes Schill 60866d16b1 Add tests for ApiKeysPage #13411 2018-09-27 11:53:19 +02:00
Johannes Schill e3d579e410 Add "search box" and a "add new" box to the new API Keys page #13411 2018-09-27 11:53:19 +02:00
Johannes Schill cc0802cc39 Pick up the type from app/types 2018-09-27 11:53:19 +02:00
Johannes Schill 97d718f87a Pick up the type from app/types 2018-09-27 11:53:18 +02:00
Johannes Schill e8ba35ab2d Move User type out of UserPicker and into app/types 2018-09-27 11:53:18 +02:00
Johannes Schill 353a836128 wip: Reactify the api keys page #13411 2018-09-27 11:53:18 +02:00
bergquist c5278af6c4 add support for mysql and postgres unique index error codes 2018-09-27 11:33:13 +02:00
Torkel Ödegaard 31b8bf2d47 Merge pull request #13380 from grafana/13275-pending-invites
switch button for org users
2018-09-27 11:26:07 +02:00
bergquist 3fab616239 implement sql queries for transactional alert reminders 2018-09-27 11:14:44 +02:00
Erik Sundell e2bda4d321 stackdriver: fix typescript errors 2018-09-27 10:55:11 +02:00
Erik Sundell b724ca5b93 stackdriver: pass interval from panel to backend 2018-09-27 10:42:28 +02:00
Erik Sundell c099074d2c stackdriver: remove debug logging 2018-09-27 10:41:51 +02:00
Erik Sundell 0507ff69fb stackdriver: resolve merge conflict 2018-09-27 10:32:30 +02:00
Erik Sundell c14c848819 stackdriver: update docs so that they align with alignment period rules in stackdriver gui 2018-09-27 10:23:37 +02:00
Erik Sundell 481b8653d9 stackdriver: update alignment period rules according to stackdriver 2018-09-27 10:20:01 +02:00
Daniel Lee 6358d3f314 stackdriver: set target to be raw query 2018-09-27 10:14:10 +02:00
Daniel Lee d405d8f255 stackdriver: publish docs to v5.3 (not root) 2018-09-27 10:14:10 +02:00
bergquist ff79f80685 initial rename refactoring 2018-09-27 09:43:00 +02:00
bergquist 0476520f2d changelog: adds note about closing #12534 2018-09-27 09:25:57 +02:00
Marcus Efraimsson f6b8d3a1c2 devenv: grafana high availability (ha) test setup 2018-09-27 09:24:40 +02:00
Carl Bergquist 464f3f738f Merge pull request #13360 from sapcc/symlinks
resolve symlink on each run
2018-09-27 09:21:29 +02:00
Erik Sundell 3c6c456592 stackdriver: use more appropriate test data 2018-09-27 09:19:24 +02:00
Torkel Ödegaard dbec2ded25 Update CHANGELOG.md 2018-09-27 09:15:23 +02:00
Torkel Ödegaard a6b32305e9 Merge pull request #12219 from PrincipalsOffice/fix-#12030
Prevent refresh on fixed time window
2018-09-27 09:14:02 +02:00
Torkel Ödegaard c962fb675e Merge pull request #13432 from mjtrangoni/add-goconst-circleci
Add goconst to CircleCI
2018-09-27 08:41:36 +02:00
ryan b4fad40c5a Merge remote-tracking branch 'grafana/master' into proxy-slash
* grafana/master: (127 commits)
  alerting: move all notification conditions to defaultShouldNotify
  filter NULL values for column value suggestions
  imguploader: Add support for ECS credential provider for S3
  Remove .dropdown-menu-open on body click fixes #13409
  Remove option r from ln command since its not working everywhere
  fix: updated tests
  Fix spelling of your and you're
  Changed setting to be an alerting setting
  Remove non-existing css prop
  fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
  rendering: Added concurrent rendering limits
  devenv: fix uid for bulk alert dashboards
  Explore: moved code to app/features/explore
  target gfdev-prometheus datasource
  devenv: adds script for creating many dashboards with alerts
  Fix goconst issues
  When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
  provisioning: changed provisioning default update interval from 3 to 10 seconds
  Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
  docs: improve oauth generic azure ad instructions
  ...
2018-09-26 20:24:08 -07:00
ryan 16ac02f9c7 Merge remote-tracking branch 'grafana/master'
* grafana/master: (127 commits)
  alerting: move all notification conditions to defaultShouldNotify
  filter NULL values for column value suggestions
  imguploader: Add support for ECS credential provider for S3
  Remove .dropdown-menu-open on body click fixes #13409
  Remove option r from ln command since its not working everywhere
  fix: updated tests
  Fix spelling of your and you're
  Changed setting to be an alerting setting
  Remove non-existing css prop
  fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
  rendering: Added concurrent rendering limits
  devenv: fix uid for bulk alert dashboards
  Explore: moved code to app/features/explore
  target gfdev-prometheus datasource
  devenv: adds script for creating many dashboards with alerts
  Fix goconst issues
  When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
  provisioning: changed provisioning default update interval from 3 to 10 seconds
  Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
  docs: improve oauth generic azure ad instructions
  ...
2018-09-26 20:23:33 -07:00
Mario Trangoni 803e716213 Add goconst to CircleCI 2018-09-26 22:43:15 +02:00
Torkel Ödegaard 283f693600 fix: also set dashboard refresh to false 2018-09-26 13:13:00 -07:00
Torkel Ödegaard 0f4904038e simplified fix for 12030 2018-09-26 13:08:55 -07:00
Jiang Ye 4c4e5533a1 prevent refresh on fixed time window 2018-09-26 13:08:55 -07:00
Peter Holmberg 32389f6171 using more variables 2018-09-26 21:27:14 +02:00
Torkel Ödegaard ec4b165b3c Merge pull request #13392 from mjtrangoni/fix-goconst-issues
Fix goconst issues
2018-09-26 20:12:44 +02:00
Torkel Ödegaard 5a2b1b1abf Merge pull request #13424 from aidan-/master
imguploader: Add support for ECS credential provider for S3
2018-09-26 20:05:04 +02:00
Erik Sundell 284d0b7edf Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 18:04:30 +02:00
Erik Sundell 75a2ea5c71 stackdriver: fix broken test 2018-09-26 18:04:04 +02:00
Daniel Lee 66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +02:00
Erik Sundell 2628ef7ed2 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 17:58:50 +02:00
Erik Sundell c3780d09d4 stackdriver: workaround for the fact the jest definitions does not include not 2018-09-26 17:56:45 +02:00
Daniel Lee 4c695dbd57 stackdriver: docs update 2018-09-26 17:54:32 +02:00
Erik Sundell ed6d3bf6ed stackdriver: WIP - implement stackdriver style auto alignment period. also return the used alignment period and display it in the query editor 2018-09-26 17:50:08 +02:00
Marcus Efraimsson 869e36995a Merge pull request #13427 from svenklemm/postgres-suggest-null-fix
filter NULL values in column value suggestion query
2018-09-26 16:21:11 +02:00
Erik Sundell af9033f3e0 stackdriver: distinct grafana auto from stackdriver auto in alignment period 2018-09-26 15:44:09 +02:00
Erik Sundell 13c68e6ed8 stackdriver: use correct name for variable 2018-09-26 15:37:29 +02:00
Leonard Gram 5cf0fb49bb Merge pull request #13402 from bergquist/alert_notifier_reminder
alerting: move all notification conditions to defaultShouldNotify
2018-09-26 15:36:39 +02:00
Erik Sundell cb90b638d7 stackdriver: remove montly from alignment periods 2018-09-26 15:22:07 +02:00
Peter Holmberg 3590ca2632 Added constant 2018-09-26 15:18:46 +02:00
Peter Holmberg 70c3e1f3bc tests 2018-09-26 15:12:06 +02:00
Erik Sundell dde033c14a stackdriver: add alignemnt period 2018-09-26 15:03:44 +02:00
Erik Sundell b883d7c1f3 stackdriver: make sure service and metric display name is used instead of value when loading a saved query editor 2018-09-26 15:01:02 +02:00
bergquist b04052f515 alerting: move all notification conditions to defaultShouldNotify 2018-09-26 14:34:10 +02:00
Erik Sundell 2965f58838 stackdriver: use correct event name 2018-09-26 13:42:53 +02:00
Erik Sundell 85fce84087 stackdriver: fix broken tests 2018-09-26 13:39:03 +02:00
Erik Sundell 1a91e0baf6 stackdriver: update aggregation and alignment before refreshing when changing metric 2018-09-26 13:22:20 +02:00
Erik Sundell 508601c28c stackdriver: use correct naming convention 2018-09-26 11:23:46 +02:00
Erik Sundell 186dcc001c Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-26 11:17:52 +02:00
Erik Sundell 49cd31ab78 stackdriver: get value type and metric kind from metric descriptor instead of from latest metric result 2018-09-26 11:17:24 +02:00
Sven Klemm 9dbdc29118 filter NULL values for column value suggestions 2018-09-26 10:56:25 +02:00
Torkel Ödegaard 8b5aefae26 Merge pull request #13417 from British-Steel/Remove-dropdown-menu-open-class-when-out-of-focus
Remove .dropdown-menu-open on body click fixes #13409
2018-09-26 10:54:38 +02:00
Patrick O'Carroll e9790c9f1b changed to first and last child 2018-09-26 07:56:33 +02:00
Aidan Rowe 53c7b33926 imguploader: Add support for ECS credential provider for S3 2018-09-26 10:22:17 +10:00
Daniel Lee 0a77cd5569 stackdriver: adds on-change with debounce for alias by field 2018-09-26 00:33:18 +02:00
Carl Bergquist af0f3f2119 Merge pull request #13391 from grafana/provisioning-interval
provisioning: changed update interval default 3 to 10 seconds
2018-09-25 22:43:34 +02:00
Marcus Efraimsson 90595ffdce cli: fix init of bus 2018-09-25 21:31:24 +02:00
Chris Hicks 499b71c8ff Remove .dropdown-menu-open on body click fixes #13409 2018-09-25 16:12:11 +01:00
Erik Sundell 2d602bfcf3 stackdriver: improve aggregation logic 2018-09-25 17:03:10 +02:00
Erik Sundell 38e32a902e stackdriver: fix failing test 2018-09-25 16:51:39 +02:00
Erik Sundell 3f7314831f stackdriver: wip: split metric dropdown into two parts - resource and metric 2018-09-25 16:51:12 +02:00
Peter Holmberg 64eace96c0 first test 2018-09-25 16:50:13 +02:00
Erik Sundell a41c5f7b37 stackdriver: remove console.log 2018-09-25 16:40:15 +02:00
Peter Holmberg 0b7576a1f9 filter plugins and layout mode 2018-09-25 16:21:52 +02:00
Carl Bergquist 4520962ac2 Merge pull request #13401 from grafana/render-limits
Concurrent render limits
2018-09-25 15:28:57 +02:00
Erik Sundell 7f43909390 stackdriver: typescriptifying controller 2018-09-25 15:16:33 +02:00
Erik Sundell b6a918ba79 stackdriver: merge commit 2018-09-25 15:13:24 +02:00
Torkel Ödegaard c7ea2d10a2 Merge pull request #13413 from grafana/remove-ln-r
Remove option r from ln command since its not working everywhere
2018-09-25 14:58:07 +02:00
Peter Holmberg e8cc0f3fff render list 2018-09-25 14:53:55 +02:00
Erik Sundell 7666e7bfe3 stackdriver: break out aggretation logic into its own directive and controller. also adds tests for new dropdown population logic 2018-09-25 14:42:47 +02:00
Johannes Schill 54f7920f0d Remove option r from ln command since its not working everywhere 2018-09-25 14:02:55 +02:00
Torkel Ödegaard 862ca07f03 fix: updated tests 2018-09-25 14:01:38 +02:00
Peter Holmberg ff96a6b766 using variable 2018-09-25 13:39:22 +02:00
Torkel Ödegaard 8009bc3940 Merge pull request #13407 from grafana/13312_legend_table_width
13312 legend table width
2018-09-25 13:17:35 +02:00
Torkel Ödegaard b131bb20c9 Merge pull request #13410 from connection-reset/your-youre
Fix spelling of your and you're
2018-09-25 13:16:46 +02:00
Axel Pirek d2f2c3f220 Fix spelling of your and you're 2018-09-25 12:38:02 +02:00
Torkel Ödegaard cb96c6d942 Changed setting to be an alerting setting 2018-09-25 12:17:04 +02:00
Peter Holmberg bb20e5cb94 created test for graph disclaimer 2018-09-25 11:50:55 +02:00
Johannes Schill 4640528857 Remove non-existing css prop 2018-09-25 11:17:26 +02:00
Johannes Schill 776f55dc80 fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312 2018-09-25 11:14:44 +02:00
Erik Sundell b700c6b0e4 stackdriver: populate alignment and aggregation dropdowns based on metric type and value type 2018-09-25 09:34:14 +02:00
Leonard Gram 06d24df7b4 docs: postgres gif. 2018-09-24 16:58:39 +02:00
Peter Holmberg ecf08b060c limit number of time series show in explore graph 2018-09-24 16:35:24 +02:00
Leonard Gram ac5d585902 docs: whats new for 5.3 2018-09-24 16:31:59 +02:00
Torkel Ödegaard 4dab595ed7 rendering: Added concurrent rendering limits 2018-09-24 16:14:11 +02:00
Daniel Lee 1aba5f814b stackdriver: fix test after parameter added to constructor 2018-09-24 16:05:16 +02:00
Daniel Lee 4777689f29 stackdriver: skeleton for more query types on the backend 2018-09-24 16:02:35 +02:00
Daniel Lee fbc1af6cd5 stackdriver: better error handling for getLabels 2018-09-24 15:40:10 +02:00
Daniel Lee c9ee05422f stackdriver: move getLabels from query_ctrl to datasource
so can reuse for annotation query ctrl.
2018-09-24 15:26:49 +02:00
Axel Pirek e35f06b938 Run all sql data source queries for one panel concurrently 2018-09-24 14:53:39 +02:00
Torkel Ödegaard b41333d4b9 Merge pull request #13398 from bergquist/bulk_alerting_dashboards
devenv: adds script for creating many dashboards with alerts
2018-09-24 14:51:19 +02:00
Patrick O'Carroll daffa7d067 removed border, cleaned up css and fixed class naming 2018-09-24 12:49:29 +02:00
Marcus Efraimsson 30fe407e8e devenv: fix uid for bulk alert dashboards 2018-09-24 12:45:30 +02:00
David Kaltschmidt d07a3a7637 Explore: moved code to app/features/explore 2018-09-24 12:16:06 +02:00
Torkel Ödegaard db1153e5df Merge pull request #12877 from grafana/davkal/explore-logs-labels
Explore: label selector for logging
2018-09-24 11:42:48 +02:00
bergquist fd5acdd857 target gfdev-prometheus datasource 2018-09-24 10:59:39 +02:00
Daniel Lee e101bcdb13 stackdriver: fix bug when multiple projects connected to service account
We had incorrectly assumed that a service account could only be connected
to one project.
2018-09-24 10:17:06 +02:00
bergquist 9774ec0ad7 devenv: adds script for creating many dashboards with alerts 2018-09-24 10:00:47 +02:00
Daniel Lee 636d8421d0 stackdriver: refactoring - extract out filtersegments component 2018-09-24 00:59:28 +02:00
Daniel Lee 681cd7496e stackdriver: alias patterns WIP
This is using the {{}} syntax for alias patterns. Might
switch to the  syntax instead.
2018-09-23 22:04:24 +02:00
Mario Trangoni 0870464ea5 Fix goconst issues
See,
$ gometalinter --vendor --disable-all --enable=goconst --disable=gotype --deadline=6m ./...
build.go:113:15⚠️ 2 other occurrence(s) of "linux" found in: build.go:119:15 build.go:491:34 (goconst)
build.go:119:15⚠️ 2 other occurrence(s) of "linux" found in: build.go:113:15 build.go:491:34 (goconst)
build.go:491:34⚠️ 2 other occurrence(s) of "linux" found in: build.go:113:15 build.go:119:15 (goconst)
build.go:381:21⚠️ 2 other occurrence(s) of "windows" found in: build.go:423:13 build.go:487:13 (goconst)
build.go:423:13⚠️ 2 other occurrence(s) of "windows" found in: build.go:381:21 build.go:487:13 (goconst)
build.go:487:13⚠️ 2 other occurrence(s) of "windows" found in: build.go:381:21 build.go:423:13 (goconst)
pkg/api/dashboard.go:67:22⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:67:35⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:131:10⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/dashboard.go:406:13⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/folder.go:98:22 pkg/api/folder.go:98:35 (goconst)
pkg/api/folder.go:98:22⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:35 (goconst)
pkg/api/folder.go:98:35⚠️ 5 other occurrence(s) of "Anonymous" found in: pkg/api/dashboard.go:67:22 pkg/api/dashboard.go:67:35 pkg/api/dashboard.go:131:10 pkg/api/dashboard.go:406:13 pkg/api/folder.go:98:22 (goconst)
pkg/api/index.go:63:47⚠️ 2 other occurrence(s) of "light" found
in: pkg/api/index.go:91:22 pkg/api/index.go:93:16 (goconst)
pkg/api/index.go:91:22⚠️ 2 other occurrence(s) of "light" found in: pkg/api/index.go:63:47 pkg/api/index.go:93:16 (goconst)
pkg/api/index.go:93:16⚠️ 2 other occurrence(s) of "light" found in: pkg/api/index.go:63:47 pkg/api/index.go:91:22 (goconst)
pkg/components/null/float.go:71:25⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:103:10 pkg/components/null/float.go:112:10 (goconst)
pkg/components/null/float.go:103:10⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:71:25 pkg/components/null/float.go:112:10 (goconst)
pkg/components/null/float.go:112:10⚠️ 2 other occurrence(s) of "null" found in: pkg/components/null/float.go:71:25 pkg/components/null/float.go:103:10 (goconst)
pkg/services/alerting/notifiers/pagerduty.go:79:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/kafka.go:64:16 pkg/services/alerting/notifiers/opsgenie.go:98:16 (goconst)
pkg/services/alerting/notifiers/kafka.go:64:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/pagerduty.go:79:16 pkg/services/alerting/notifiers/opsgenie.go:98:16 (goconst)
pkg/services/alerting/notifiers/opsgenie.go:98:16⚠️ 2 other occurrence(s) of "Triggered metrics:\n\n" found in: pkg/services/alerting/notifiers/pagerduty.go:79:16 pkg/services/alerting/notifiers/kafka.go:64:16 (goconst)
pkg/social/social.go:85:11⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:162:14 pkg/social/social.go:197:11 (goconst)
pkg/social/social.go:162:14⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:85:11 pkg/social/social.go:197:11 (goconst)
pkg/social/social.go:197:11⚠️ 2 other occurrence(s) of "grafana_com" found in: pkg/social/social.go:85:11 pkg/social/social.go:162:14 (goconst)
pkg/tsdb/elasticsearch/time_series_query.go:92:17⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:167:31 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:152:8⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:167:31 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:167:31⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:315:9 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:315:9⚠️ 3 other occurrence(s) of "count" found in: pkg/tsdb/elasticsearch/time_series_query.go:92:17 pkg/tsdb/elasticsearch/response_parser.go:152:8 pkg/tsdb/elasticsearch/response_parser.go:167:31 (goconst)
pkg/tsdb/elasticsearch/time_series_query.go:78:9⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/response_parser.go:84:22 pkg/tsdb/elasticsearch/response_parser.go:369:24 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:84:22⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/time_series_query.go:78:9 pkg/tsdb/elasticsearch/response_parser.go:369:24 (goconst)
pkg/tsdb/elasticsearch/response_parser.go:369:24⚠️ 2 other occurrence(s) of "date_histogram" found in: pkg/tsdb/elasticsearch/time_series_query.go:78:9 pkg/tsdb/elasticsearch/response_parser.go:84:22 (goconst)
2018-09-23 21:19:21 +02:00
Torkel Ödegaard bdea8d2485 Merge pull request #13394 from jsferrei/include-stack-offset
Fix #13356, where tooltips do not display individual values on stacked graphs
2018-09-23 20:54:03 +02:00
Jon Ferreira e91729a568 When stacking graphs, always include the y-offset so that tooltips can
render proper values for individual points
2018-09-22 15:02:01 -04:00
Torkel Ödegaard 98dad530e2 provisioning: changed provisioning default update interval from 3 to 10 seconds 2018-09-22 10:06:57 +02:00
Torkel Ödegaard 3fd3dbba8a Merge pull request #13388 from jsferrei/fix-metric-segment-typeahead
Fix metric-segment options displaying after blur
2018-09-22 09:42:53 +02:00
Adrian Muraru bd1f87ed45 Update render.js 2018-09-22 00:54:56 +03:00
Adrian Muraru b7feabdb58 Update render.js 2018-09-22 00:49:50 +03:00
Jon Ferreira 5fd24e2435 Fix https://github.com/grafana/grafana/issues/13387 metric segment
options displays after blur
2018-09-21 17:25:37 -04:00
Marcus Efraimsson 9fe0dcec0e Merge pull request #12716 from Bigtalljosh/patch-1
Update Configuration.md
2018-09-21 17:47:52 +02:00
Marcus Efraimsson 7641c37dfc docs: improve oauth generic azure ad instructions 2018-09-21 16:57:39 +02:00
Marcus Efraimsson 87bee3d983 Merge branch 'master' into patch-1 2018-09-21 16:55:09 +02:00
Torkel Ödegaard 4022374181 Merge pull request #12128 from grafana/11056-folder-m
added span with folder title that is shown for recently and starred
2018-09-21 16:49:43 +02:00
Torkel Ödegaard 6db0880fd8 invalidate access token cache after datasource is updated 2018-09-21 14:24:44 +02:00
Marcus Efraimsson 5c2d1134ee Merge pull request #13383 from mjtrangoni/fix-misspell-issues
Fix misspell issues
2018-09-21 14:02:49 +02:00
Mario Trangoni 60dfff11a0 Fix datbase > database 2018-09-21 13:41:31 +02:00
Mario Trangoni da46cc2fca Fix changed want md5 hash 2018-09-21 13:41:03 +02:00
Mario Trangoni f0167e17ed Revert Fahrenheit to Farenheit
This is a typo in
https://github.com/grafana/grafana/blob/master/public/app/core/utils/kbn.ts#L1051
2018-09-21 13:39:24 +02:00
Mario Trangoni 80fa66fcb0 Fix some typos found by codespell
See,
$ codespell -S "./.git*,./vendor*,./public*"
2018-09-21 11:54:52 +02:00
Mario Trangoni 3689bb778c Fix misspell issues
See,
$ gometalinter --disable-all --enable misspell --deadline 10m --vendor ./...
pkg/api/dtos/alerting_test.go:32:13⚠️ "expectes" is a misspelling of "expects" (misspell)
pkg/api/static/static.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/components/imguploader/azureblobuploader.go:55:48⚠️ "conatiner" is a misspelling of "container" (misspell)
pkg/login/ldap_settings.go:51:115⚠️ "compatability" is a misspelling of "compatibility" (misspell)
pkg/middleware/auth_proxy_test.go:122:22⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/middleware/logger.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/notifications/codes.go:9:13⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/session/mysql.go:170:3⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/mysql.go:171:24⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:95:4⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:96:1⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:167:25⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/setting/setting.go:1:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:199:14⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:270:15⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/elasticsearch/response_parser.go:531:24⚠️ "Unkown" is a misspelling of "Unknown" (misspell)
pkg/tsdb/elasticsearch/client/search_request.go:113:7⚠️ "initaite" is a misspelling of "initiate" (misspell)

Note: Unknwon is a library name, and Destory a mysql typo.
2018-09-21 11:54:36 +02:00
Torkel Ödegaard 040095b5a8 fix: use same User-Agent header as in other places in grafana when making external requests 2018-09-21 11:35:55 +02:00
Torkel Ödegaard 855a2a9259 docs: changed Json Web Token wording to be just JSON key file 2018-09-21 11:30:57 +02:00
Torkel Ödegaard 94ee39291f added beta notice 2018-09-21 11:28:19 +02:00
Patrick O'Carroll c1d36f9e48 created switch button for org users that can toggle between users and invites 2018-09-21 10:25:46 +02:00
Torkel Ödegaard c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Torkel Ödegaard 68d5738c48 Merge pull request #13341 from grafana/davkal/13336-fix-recording-rules-labels-suggestions
Explore: Fix label suggestions for recording rules
2018-09-21 10:15:57 +02:00
Torkel Ödegaard 663a56cba9 Merge pull request #13374 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-09-21 10:15:21 +02:00
Torkel Ödegaard 785f35b1c9 Merge branch 'master' of github.com:grafana/grafana 2018-09-21 09:24:03 +02:00
Mario Trangoni 03a2a39a2a pkg/tracing/tracing.go: replace deprecated cfg.New function
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tracing/tracing.go:81:25⚠️ cfg.New is deprecated: use NewTracer() function  (SA1019) (megacheck)
2018-09-20 22:32:22 +02:00
Daniel Lee ddee919edc stackdriver: remove WIP tests 2018-09-20 20:34:16 +02:00
Mario Trangoni 0dea8fe1e0 pkg/services/sqlstore/user.go: empty branch
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/services/sqlstore/user.go:274:3⚠️ empty branch (SA9003) (megacheck)
2018-09-20 20:16:14 +02:00
Mario Trangoni 303e70db25 pkg/tsdb/elasticsearch/response_parser.go: simplify redundant code
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/response_parser.go:95:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:125:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:317:5⚠️ redundant break statement (S1023) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:358:5⚠️ redundant break statement (S1023) (megacheck)
2018-09-20 20:07:03 +02:00
Mario Trangoni b609d81194 pkg/tsdb/elasticsearch/client/search_request.go: simplify loop with
append.

$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/client/search_request.go:59:4⚠️ should replace loop with sr.Aggs = append(sr.Aggs, aggArray...) (S1011) (megacheck)
pkg/tsdb/elasticsearch/client/search_request.go:303:4⚠️ should replace loop with agg.Aggregation.Aggs = append(agg.Aggregation.Aggs, childAggs...) (S1011) (megacheck)
2018-09-20 20:00:02 +02:00
Marcus Efraimsson a6c438c878 Merge pull request #13367 from grafana/davkal/explore-julius-fixes
Explore: Query field fixes
2018-09-20 17:57:01 +02:00
David Kaltschmidt 9e86809ace Explore: remove closing brace with opening brace 2018-09-20 17:22:38 +02:00
David Kaltschmidt 0e173918aa Explore: show series title in tooltip of legend item 2018-09-20 17:02:26 +02:00
David Kaltschmidt 377bc44062 Explore: dont rate-hint on rate queries 2018-09-20 16:59:06 +02:00
David Kaltschmidt 4a8d80a940 Explore: Fix metric suggestions when first letters have been typed 2018-09-20 16:57:58 +02:00
Marcus Efraimsson d8b566a177 Merge pull request #13363 from k3ypad/auth_overview_typo
Fix misspelled authentication in Auth overview doc
2018-09-20 16:28:34 +02:00
Ben Doyle 7a95791025 Fix misspelled authentication in Auth overview doc 2018-09-20 14:16:43 +01:00
Arno Uhlig 1355c00c44 fix reader linux test 2018-09-20 13:42:56 +02:00
Arno Uhlig 6b2d91815a resolve symlink on each run 2018-09-20 11:46:32 +02:00
Daniel Lee 8211f7d0ea stackdriver: add templating support for metric, filter and group by
Still have to figure out if we should have templating for aggregation
fields
2018-09-20 11:44:17 +02:00
Torkel Ödegaard 5b52225450 wip: panel options idea2 2018-09-20 09:01:06 +02:00
Daniel Lee 8d1f293676 stackdriver: use group by fields to create default alias 2018-09-20 00:52:14 +02:00
Ryan McKinley 7168190f7a make sure we don't add the slash twice 2018-09-19 10:02:04 -07:00
Adrian Muraru ba4d5ddaaa Update render.js 2018-09-19 19:36:56 +03:00
Marcus Efraimsson 667ca3d54d devenv: fix docker blocks paths 2018-09-19 17:59:55 +02:00
Torkel Ödegaard c67327d768 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 17:45:58 +02:00
Adrian Muraru dbcd242b09 Updated phantomjs render script to take full height screenshots 2018-09-19 18:43:33 +03:00
Marcus Efraimsson 28ff8a6716 Merge pull request #13342 from svenklemm/unnest
Don't use unnest in queries for redshift compatibility
2018-09-19 16:08:23 +02:00
Marcus Efraimsson 978284bc3d devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
Torkel Ödegaard 6eb15df953 Merge pull request #13339 from grafana/davkal/13337-fix-rules-filter
Explore: Fix click to filter for recording rule expressions
2018-09-19 13:53:42 +02:00
David Kaltschmidt f25538744d Explore: Fix label suggestions for recording rules
- parsing of recording rules failed for label suggestor
- added ':' to parsing routine
2018-09-19 12:01:02 +02:00
David Kaltschmidt 6aac8610eb Explore: Fix click to filter for recording rule expressions
- recording rule names contain ':'
- include this in the pattern for metric names
2018-09-19 11:45:55 +02:00
Sven Klemm e07513bd65 Don't use unnest in queries for redshift compatibility 2018-09-19 10:59:25 +02:00
Carl Bergquist fe9d86c070 Merge pull request #13330 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-09-19 09:52:09 +02:00
Torkel Ödegaard dc1535cf64 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 09:09:25 +02:00
Mario Trangoni 13a1d0a026 pkg/tsdb/elasticsearch/client/client.go: use time.Since instead of time.Now().Sub
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/tsdb/elasticsearch/client/client.go:147:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:190:14⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:218:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni f19fd1a9b0 pkg/plugins/dashboards_updater.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/plugins/dashboards_updater.go:51:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:25 +02:00
Mario Trangoni bb5aaa2dce pkg/services/sqlstore/alert_notification.go: Simplify err check
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/services/sqlstore/alert_notification.go:242:3⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2018-09-18 23:42:20 +02:00
Ryan McKinley 7c6227c061 remove the test that does not do anything 2018-09-18 11:18:55 -07:00
Ryan McKinley bc68aa99b2 add the trailing slash 2018-09-18 11:16:09 -07:00
Daniel Lee 408d4bda95 stackdriver: add custom User-Agent header 2018-09-18 16:07:14 +02:00
Daniel Lee e05b86375b stackdriver: remove hardcoding of test project name 2018-09-18 16:02:38 +02:00
Torkel Ödegaard 3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +02:00
Torkel Ödegaard 61b2100b9f Merge pull request #13317 from bergquist/nuke_codecov
disable codecov
2018-09-18 12:33:24 +02:00
Torkel Ödegaard d964a6505f Merge pull request #13305 from bergquist/devenv_cleanup
removes unused files
2018-09-18 12:32:26 +02:00
bergquist 0f8b9b8ff9 set maxworkers 2 for frontend tests 2018-09-18 12:18:35 +02:00
bergquist 63ed02e626 removes codedov refs 2018-09-18 11:44:31 +02:00
bergquist 1be26ad362 disable codecov 2018-09-18 11:39:22 +02:00
Ryan McKinley 71dfeff782 add a test 2018-09-17 12:28:36 -07:00
Marcus Efraimsson ccf3cb5c8b Merge pull request #13307 from Nick-Triller/fix_setting_test
Fix setting test
2018-09-17 18:28:22 +02:00
Nick Triller f8ca55bb1f Fix setting test 2018-09-17 17:56:52 +02:00
Erik Sundell 7b8ea5fc54 stackdriver: improve query look 2018-09-17 17:34:01 +02:00
bergquist 8dbba467f1 moves /tests to /pkg/plugins
ref #11433
2018-09-17 17:29:47 +02:00
Erik Sundell cfb8017567 stackdriver: add alignment period to query controller 2018-09-17 17:16:14 +02:00
Erik Sundell edf38f040d stackdriver: making sure we dont pass too big alignmentPeriods to the stackdriver api 2018-09-17 17:13:06 +02:00
Erik Sundell f839d12de4 stackdriver: fix broken tests 2018-09-17 16:33:38 +02:00
Erik Sundell 109f00f584 stackdriver: adds default value for alignment period 2018-09-17 16:33:10 +02:00
Erik Sundell 71b1f7f8fd stackdriver: use alignment period that is passed from frontend. if set to auto, use value provided from the panel. also added tests for alignment period 2018-09-17 16:30:06 +02:00
Torkel Ödegaard e74ce72410 Merge pull request #13301 from bergquist/devenv_tests
moves files from /tests to more appropriate folders
2018-09-17 15:51:42 +02:00
Torkel Ödegaard 3853a0865c Merge pull request #13300 from bergquist/devenv_docker
Moves docker/ to devenv/docker
2018-09-17 15:51:06 +02:00
Erik Sundell 73dc7bddd0 stackdriver: use alignment that is passed from frontend in the query 2018-09-17 14:34:18 +02:00
Erik Sundell 549b4fc0ae stackdriver: adds advanced options collapse to query editor with the possibility to select secondary aggregation and alignment 2018-09-17 14:32:49 +02:00
Torkel Ödegaard c2686781b9 Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana 2018-09-17 13:21:11 +02:00
Torkel Ödegaard 742d2041a4 Merge pull request #13282 from grafana/davkal/explore-multiline-syntax
Explore: Add multiline syntax highlighting to query field
2018-09-17 13:20:19 +02:00
bergquist 6938fd5fff Merge branch 'brian2222-patch-1'
* brian2222-patch-1:
  removes testdata from getting started
  Update getting_started.md
2018-09-17 11:51:48 +02:00
bergquist d84a0ec3e7 removes testdata from getting started 2018-09-17 11:50:22 +02:00
Erik Sundell f243da756b stackdriver: fix init labels bug 2018-09-17 11:28:10 +02:00
bergquist 8e69d7731a moves benchmark script to devenv
ref #11433
2018-09-17 11:17:23 +02:00
bergquist c1f797ed90 moves docker/ to devenv/docker 2018-09-17 11:10:03 +02:00
Carl Bergquist f2247c160a Merge pull request #13279 from bergquist/init_some_counter_as_zero
Internal metrics: starts counters at zero
2018-09-17 11:09:19 +02:00
bergquist d9ca8b43b7 changelog: adds note about closing #9735 2018-09-17 10:50:32 +02:00
Carl Bergquist f22f1d46c8 Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var
annotations: allows template variables to be used in tag filter
2018-09-17 10:34:38 +02:00
Marcus Efraimsson 6ffca7f184 docs: add version disclaimer for postgres query editor 2018-09-17 10:32:28 +02:00
Marcus Efraimsson 112f03a6ab Merge pull request #13293 from svenklemm/postgres-docs-query-builder
Add documentation for postgres query builder
2018-09-17 10:28:39 +02:00
Carl Bergquist 6dff5e6bc7 Merge pull request #13295 from mjtrangoni/fix-some-megacheck-issues
Fix some megacheck issues
2018-09-17 10:13:34 +02:00
bergquist 8e5000fb31 moves files from /tests to more appropriate folders
ref #11433
2018-09-17 10:10:20 +02:00
bergquist 7588283287 docs: template variable support for annotations 2018-09-17 09:30:03 +02:00
Marcus Efraimsson b2833daf32 Merge pull request #13285 from marefr/team_member_ext
Team member labels
2018-09-17 09:14:06 +02:00
brian2222 02dd27333e Update getting_started.md
list of datasources updated in section: dashboards, panels, the buildingblocks of grafana...
2018-09-16 18:22:09 -07:00
Mario Trangoni e85d0e8d6b pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck)
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID
alert.go:193:15⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
alert.go:252:18⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:136:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:169:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:119:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:221:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
team.go:77:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:243:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:267:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:282:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:313:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:475:3⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:479:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:493:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
2018-09-16 12:37:08 +02:00
Mario Trangoni f73236f8f4 pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck)
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL
alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:172:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:199:17⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:223:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
2018-09-16 12:26:05 +02:00
Torkel Ödegaard dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard 693f2fd8e9 Merge pull request #13273 from grafana/permissions-to-redux
Permissions to redux
2018-09-15 15:02:13 +02:00
Torkel Ödegaard 66ae7ddc02 fix: increased team picker limit to 50, closes #13294 2018-09-15 04:59:45 -07:00
Torkel Ödegaard 438119b806 Merge pull request #13284 from cbonte/hipchat-notifications
fix hipchat color code used for "no data" notifications
2018-09-15 13:57:09 +02:00
Torkel Ödegaard 3f309ff5dd rename folder 2018-09-15 04:50:22 -07:00
Sven Klemm 138e7ab264 Add documentation for PostgreSQL query builder 2018-09-14 21:58:02 +02:00
Daniel Lee 0b41303e10 stackdriver: improve query editor to handle no data better 2018-09-14 19:28:48 +02:00
Daniel Lee 12da19695f stackdriver: fixes in query editor 2018-09-14 17:47:39 +02:00
Daniel Lee 669a1029ed stackdriver: type rename 2018-09-14 17:46:42 +02:00
Marcus Efraimsson da68b858d7 display team member labels 2018-09-14 17:28:34 +02:00
Marcus Efraimsson 9a6446c2b5 new column for team_member table 2018-09-14 17:27:36 +02:00
Cyril Bonté 0f4ee4ce87 fix hipchat color code used "no data" notifications 2018-09-14 17:22:07 +02:00
Erik Sundell 3ba0195330 stackdriver: merge commit 2018-09-14 17:21:35 +02:00
Erik Sundell b30d3fb5a1 stackdriver: makes sure filter dropdown doesnt crash if clicked before values are loaded 2018-09-14 17:19:15 +02:00
Daniel Lee 6f5fbf7a43 fixes strange gofmt formatting
VS code refuses to format this correctly unless the zabbix ds
is last in the list.
2018-09-14 17:11:58 +02:00
Torkel Ödegaard 6cdfff52f7 Merge branch 'master' of github.com:grafana/grafana 2018-09-14 17:10:20 +02:00
Torkel Ödegaard f2833bfd52 Merge pull request #13252 from grafana/10040_active_directory
docs: include active directory ldap example and restructure
2018-09-14 17:09:44 +02:00
Erik Sundell fa6e31c6d5 stackdriver: adds null check to query 2018-09-14 17:01:27 +02:00
Torkel Ödegaard 462b5d937c gdev: added test dashboard for polystat panel 2018-09-14 16:48:31 +02:00
David Kaltschmidt face5b1890 Explore: Add multiline syntax highlighting to query field
- the non-nested query field schema did not allow for multi-line
  highlighting
- added explicit code schema and a `makeValue` function that enforces
  the nested structure
- replaced vendored prism-slate adapter with official slate-prism
  package
- renamed language to syntax
2018-09-14 16:38:45 +02:00
Daniel Lee 8b72853d36 stackdriver: add support for filtering to backend 2018-09-14 16:20:51 +02:00
David Kaltschmidt 1a38c45dde Hotfix for Explore (empty page after running query)
Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
2018-09-14 16:09:43 +02:00
Daniel Lee dc6d025d9a stackdriver: add filters to query editor
WIP -> Backend not implemented yet.
2018-09-14 15:44:12 +02:00
Torkel Ödegaard 5fbe8eff4f ldap: made minor change to group search, and to docs 2018-09-14 11:28:17 +02:00
Erik Sundell 9b4a25ed21 stackdriver: fixes remove option in filter 2018-09-14 11:24:02 +02:00
Daniel Lee 982e095f85 dsproxy: add mutex protection to the token caches 2018-09-14 11:13:09 +02:00
bergquist 0bf5a6ad71 metrics: starts some counters at zero
without starting the counter as zero Grafana will not send any metrics
to graphite using the bridge.
2018-09-14 10:06:10 +02:00
Torkel Ödegaard 270b736302 Merge pull request #13270 from tianon/fix-gauge-accuracy
Fix gauge display accuracy for "percent (0.0-1.0)"
2018-09-14 09:58:14 +02:00
Torkel Ödegaard 84a4b64176 Update CHANGELOG.md 2018-09-14 09:57:58 +02:00
Torkel Ödegaard e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Daniel Lee b5800ffea9 stackdriver: wip - filters for query editor 2018-09-14 09:39:17 +02:00
Daniel Lee e2e95589e3 stackdriver: adds remove group by option
Adds a -- remove group by -- option to the group by
segment. When chosen it removes the group by.
2018-09-14 09:39:17 +02:00
Daniel Lee d0a565d853 stackdriver: improve segments for group bys in query editor 2018-09-14 09:39:17 +02:00
Erik Sundell add23d9716 stackdriver: load time series meta data for group by dropdown 2018-09-14 09:39:17 +02:00
Erik Sundell 5763d3cae2 stackdriver: make sure distinct labels are returned. also added test 2018-09-14 09:39:17 +02:00
Erik Sundell 37fe488b69 stackdriver: fix failing test 2018-09-14 09:39:17 +02:00
Erik Sundell 3f4942418e stackdriver: test get metric types 2018-09-14 09:39:17 +02:00
Daniel Lee 9c8593e71f stackdriver: wip - group bys 2018-09-14 09:39:16 +02:00
Daniel Lee c71970baa9 stackdriver: update logo 2018-09-14 09:39:16 +02:00
Daniel Lee b8231b2903 stackdriver: ux for config page, docs updated 2018-09-14 09:39:16 +02:00
Daniel Lee 65cbcc06eb upload: make the button text configurable 2018-09-14 09:39:16 +02:00
Daniel Lee 11c45002f8 stackdriver: add simple readme 2018-09-14 09:38:16 +02:00
Daniel Lee df6b430405 stackdriver: reverse points array to be in ascending order 2018-09-14 09:38:16 +02:00
Daniel Lee f4fe26c659 stackdriver: adds support for primary aggregations
WIP: Hardcoded values for the aligner and alignment period. Need
to set the aligment period to the closest min interval and
research the aligner more.
2018-09-14 09:38:16 +02:00
Daniel Lee 0b5783563e stackdriver: better error handling and show query metadata
If the Stackdriver returns an error, show that error in the query
editor. Also, allow the user to see the raw querystring that was sent
to google (for troubleshooting).
2018-09-14 09:38:16 +02:00
Daniel Lee 2683699ab4 stackdriver: tests for parsing api response 2018-09-14 09:38:16 +02:00
Daniel Lee 54f16d5558 stackdriver: add first test for parsing frontend queries 2018-09-14 09:38:16 +02:00
Erik Sundell 95a6838f06 Stackdriver: Fix weird assignment 2018-09-14 09:38:16 +02:00
Erik Sundell 2d52e5d26c Stackdriver: Use metric type from query controller state 2018-09-14 09:38:16 +02:00
Erik Sundell 191b6cc32c Stackdriver: Set target correctly 2018-09-14 09:38:16 +02:00
Erik Sundell 1288860058 Stackdriver: Break out parse response to its own func 2018-09-14 09:38:16 +02:00
Erik Sundell 56e8e50497 Stackdriver: Use ds_auth_provider in stackdriver. This will make sure the token is renewed when it has exporired 2018-09-14 09:38:16 +02:00
Erik Sundell db170845b0 Stackdriver: Restructured ds proxy tests 2018-09-14 09:38:16 +02:00
Daniel Lee 05f6710454 stackdriver: fix test 2018-09-14 09:38:16 +02:00
Erik Sundell 1725940ab9 Stackdriver: Add new file 2018-09-14 09:38:16 +02:00
Erik Sundell 6a610558c4 Stackdriver: Start breaking out apply route to its own file 2018-09-14 09:38:16 +02:00
Erik Sundell 7f99a14c58 Stackdriver: Parsed url params 2018-09-14 09:38:16 +02:00
Erik Sundell c8ec3a345c Stackdriver: Parse datapoints correctly 2018-09-14 09:38:16 +02:00
Erik Sundell 97727d167b Stackdriver: Add backed query using 2018-09-14 09:38:16 +02:00
Erik Sundell 73a42df046 Stackdriver: Prettify json 2018-09-14 09:38:16 +02:00
Erik Sundell f09f5b28d7 Stackdriver: Move data to target 2018-09-14 09:38:16 +02:00
Erik Sundell 1fe70f8290 Stackdriver: Load example metric and start parsing response 2018-09-14 09:38:16 +02:00
Erik Sundell 31417b795c Stackdriver: Exposing stackdriver backend api 2018-09-14 09:38:16 +02:00
Torkel Ödegaard ddf86c25d7 Merge pull request #13274 from grafana/12946-table-cell-link
Added underline to links in table
2018-09-14 09:38:11 +02:00
Carl Bergquist 047fb770c8 Merge pull request #13269 from DanCech/pluginUpgrade
use pluginName consistently when upgrading plugins
2018-09-14 09:35:58 +02:00
Erik Sundell 23339e4322 Stackdriver: Use new access token API 2018-09-14 09:35:28 +02:00
Erik Sundell 71af62e741 Stackdriver: Temporary exporting token lookup 2018-09-14 09:35:28 +02:00
Erik Sundell 75c002645c Stackdriver: Loads project name and metrics descriptions into the query controller 2018-09-14 09:35:27 +02:00
Erik Sundell 684aa3ff33 Stackdriver: Corrected field title and removed debug logging 2018-09-14 09:35:27 +02:00
Erik Sundell 92d631986f Stackdriver: Removed debug logging 2018-09-14 09:35:27 +02:00
Erik Sundell 533891c03e Stackdriver: Improved feedback for when a JWT is already uploaded in the ds config page 2018-09-14 09:35:27 +02:00
Daniel Lee b1db6a7d1e docs: first draft for stackdriver datasource 2018-09-14 09:35:27 +02:00
Daniel Lee e7648c4070 dsproxy: implements support for plugin routes with jwt file
Google Cloud service accounts use a JWT token to get an
oauth access token. This adds support for that.
2018-09-14 09:35:27 +02:00
Erik Sundell ba7a69dfc4 Stackdriver: Added test for getProjects 2018-09-14 09:35:27 +02:00
Erik Sundell 5bee38ed69 Stackdriver: Refactored api call to google resource manager 2018-09-14 09:35:27 +02:00
Erik Sundell a4ef4792bc Stackdriver: Add scope for google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell f6c18cf788 Stackdriver: Fixed error message from google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell 55824dc4d8 Removes comment 2018-09-14 09:35:26 +02:00
Erik Sundell aff1de9892 Adds skeleton for loading projects from google resource manager 2018-09-14 09:35:26 +02:00
Erik Sundell 6840968780 Adds unit tests to test datasource 2018-09-14 09:35:26 +02:00
Erik Sundell f9b7524423 Implemented datasource test 2018-09-14 09:35:26 +02:00
Erik Sundell 350bcf4f56 Fixed broken if statement 2018-09-14 09:35:26 +02:00
Erik Sundell 7197a4c17f Adds jwt token signing google auth 2018-09-14 09:35:26 +02:00
Erik Sundell b71e7f33c3 Improved user experience 2018-09-14 09:35:26 +02:00
Erik Sundell 4fa4c27537 Upload: Fixing link function in directive 2018-09-14 09:35:26 +02:00
Erik Sundell ef3beb1f0e Adds poc code for retrieving google auth accesstoken 2018-09-14 09:33:50 +02:00
Erik Sundell 834d06c35b Build new stackdriver frontend script 2018-09-14 09:33:50 +02:00
Erik Sundell 9ee61b6606 Add stackdriver backend skeleton 2018-09-14 09:33:50 +02:00
Erik Sundell f0f19e0c03 Adds stackdriver frontend skeleton 2018-09-14 09:33:50 +02:00
Torkel Ödegaard 0e9a6dcedc Use datasource cache for backend tsdb/query endpoint (#13266)
fix: use datasource cache for backend datasources
2018-09-14 09:30:32 +02:00
Patrick O'Carroll 7b0215380f added underline to links in table 2018-09-14 08:31:41 +02:00
Torkel Ödegaard 331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard 776d81189f test: added simple dashboard reducer test 2018-09-14 07:52:17 +02:00
Torkel Ödegaard 7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Tianon Gravi 74912dca8d Fix gauge display accuracy for "percent (0.0-1.0)"
The "Decimals" value was incorrectly applied to the metric value used to calculate the gauge display in addition to the text value (so a "Decimals" value of "1" turns "45.1%" into "50%" in the gauge display even though the label still correctly says "45.1%").
2018-09-13 15:41:49 -07:00
Dan Cech 124b21a6aa use pluginName consistently when upgrading plugins 2018-09-13 17:19:51 -04:00
Torkel Ödegaard 06855d2bc3 Merge pull request #13253 from grafana/13240_auth_stats
Fix anonymous usage stats for authentication types
2018-09-13 21:17:16 +02:00
Torkel Ödegaard 4b0eeab2b3 Merge pull request #13259 from bergquist/disable_metrics_endpoint
[metrics]enabled = false should disable the /metrics endpoint.
2018-09-13 21:14:28 +02:00
Carl Bergquist ec5aa332ac removes old unused examples (#13260)
Just wanted to reduce the amount of files/folders in root
2018-09-13 21:09:21 +02:00
Torkel Ödegaard fbfcc62269 fix: added loading screen error scenario (#13256) 2018-09-13 21:08:41 +02:00
David Kaltschmidt 379227c75d Updated CHANGELOG.md 2018-09-13 17:52:28 +02:00
Marcus Efraimsson e33b2d5fce changelog: add notes about closing #11555
[skip ci]
2018-09-13 17:29:37 +02:00
David d67d890ccc Merge pull request #11789 from mtanda/prom_annotation_series_timestamp
(prometheus) add annotation option to treat series value as timestamp
2018-09-13 17:21:12 +02:00
Sven Klemm 0254a29e35 Interpolate $__interval in backend for alerting with sql datasources (#13156)
add support for interpolate $__interval and  $__interval_ms in sql datasources
2018-09-13 16:51:00 +02:00
Marcus Efraimsson 1d66f9a42c anonymous usage stats for authentication types 2018-09-13 16:36:23 +02:00
bergquist bff350166e disabling internal metrics disables /metric endpoint
but we will still keep sending metrics to graphite

closes #10638
2018-09-13 16:09:52 +02:00
Torkel Ödegaard c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
bergquist aed8208d78 renames PartialMatch to MatchAny 2018-09-13 15:15:42 +02:00
Torkel Ödegaard d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard e1a1da9064 fix: add folder permission fix 2018-09-13 14:31:12 +02:00
Torkel Ödegaard bae560717d fix: fixed tslint issue introduced in recent prometheus PR merge 2018-09-13 14:23:43 +02:00
Torkel Ödegaard f2edb82e79 Folder pages to redux (#13235)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
2018-09-13 14:10:51 +02:00
Torkel Ödegaard d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Mitsuhiro Tanda dc08093f6c minor fix 2018-09-13 20:15:33 +09:00
Mitsuhiro Tanda 3031c2e6fc fix test 2018-09-13 20:07:43 +09:00
Mitsuhiro Tanda 2926725bab add annotation option to treat series value as timestamp 2018-09-13 20:05:30 +09:00
David e4496080ff Merge pull request #12251 from mtanda/prometheus_use_matchers_for_completion
(prometheus) get label name/value from series API
2018-09-13 11:48:13 +02:00
Torkel Ödegaard f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard 8096cd8f33 fix: added reducer test 2018-09-13 07:30:27 +02:00
ryan 9f4d4a93b4 Merge remote-tracking branch 'grafana/master'
* grafana/master: (368 commits)
  Adhoc-filtering for prometheus dashboards (#13212)
  fix: url update loop fix (#13243)
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
  removes protoc from makefile
  changelog: note about closing #11681
  Adding Centrify configuration for Oauth
  refactor: moved stuff into new features dir manage-dashboards
  move: moved styleguide to admin
  fix: fixed singlestat test broken due to file move
  ...
2018-09-12 17:46:53 -07:00
David a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212)
* Basic adhoc-filtering support for prometheus
2018-09-12 18:10:57 +02:00
Marcus Efraimsson c56ca57df5 docs: include active directory ldap example and restructure 2018-09-12 17:54:47 +02:00
Dan Doyle f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard c7bb44b34a fix: url update loop fix (#13243) 2018-09-12 13:13:47 +02:00
Torkel Ödegaard a317158b72 wip: working on reducer test 2018-09-12 12:18:24 +02:00
Torkel Ödegaard 78d36f784f fix: gofmt issues 2018-09-12 09:55:22 +02:00
Torkel Ödegaard 0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
bergquist 835a75335c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master:
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
2018-09-12 09:23:54 +02:00
Torkel Ödegaard a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard 7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +02:00
qhyou11 1786198558 fix theme parameter not working problem while prefer theme set to light (#13232) 2018-09-12 06:52:38 +02:00
Torkel Ödegaard f5ee91f85a fix: added type export to fix failing test 2018-09-11 19:30:38 +02:00
Torkel Ödegaard 98daceade0 fix: fixed typescript test error 2018-09-11 19:08:32 +02:00
Torkel Ödegaard ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +02:00
Torkel Ödegaard dd01abc544 another circleci fix 2018-09-11 18:37:02 +02:00
Torkel Ödegaard 48d1ebacbb Another circleci fix 2018-09-11 18:32:19 +02:00
Torkel Ödegaard 207ce0cde1 changed gometalinter to use github master 2018-09-11 18:29:50 +02:00
Torkel Ödegaard 888ac27e25 commented out metalinter as gopkg is having issues 2018-09-11 18:24:07 +02:00
Torkel Ödegaard 19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +02:00
David d8a702cba3 Fix prometheus label filtering for comparison queries (#13213)
- Now supports click filtering for queries like `metric > 0.1`
2018-09-11 16:57:43 +02:00
Peter Holmberg 0768a078ed Upgrade react and enzyme (#13224)
* upgrade to latest react and fixed failing test

* upgrading libs

* grunt exec update due to change filename

* new yarn lock

* updated snaps
2018-09-11 16:31:34 +02:00
bergquist 1638c6bea1 enable partial tag matches for annotations 2018-09-11 15:50:04 +02:00
Torkel Ödegaard 89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
Patrick O'Carroll 953bdc4dc0 put folder name under dashboard name, tweaked aliginments in search results 2018-09-11 14:53:38 +02:00
bergquist 19c7dd9834 support template variables with multiple values 2018-09-11 14:25:25 +02:00
Peter Holmberg 9f73f13091 Teams page replace mobx (#13219)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
2018-09-11 14:14:03 +02:00
bergquist 6ba5550f5f renames jest files to match new convention 2018-09-11 14:09:08 +02:00
Torkel Ödegaard 1ce9001141 upgrade of typescript and tslint and jest (#13223) 2018-09-11 13:48:13 +02:00
Mitsuhiro Tanda 28250271cc fix nil pointer dereference (#13221) 2018-09-11 12:53:39 +02:00
bergquist abd5a74e4c Merge branch 'master' into 9587_annotation_tags_wih_temp_var
* master: (3328 commits)
  removes protoc from makefile
  changelog: note about closing #11681
  Adding Centrify configuration for Oauth
  refactor: moved stuff into new features dir manage-dashboards
  move: moved styleguide to admin
  fix: fixed singlestat test broken due to file move
  moved folders from features into the main feature folder they belong to
  Add jsonnet with grafonnet-lib to provisioning docs
  fix: Dashboard permissions now shows correctly, fixes #13201
  Update CHANGELOG.md
  redux: do not use redux logger middleware in production builds
  Allow oauth email attribute name to be configurable (#13006)
  Document required order for time series queries (#13204)
  refactor: changed AlertRuleItem pause action to callback
  Fix query builder queries for interval start
  renaming things in admin
  release 5.2.4
  changelog: release 5.2.4
  refactoring: custom scrollbars PR updated, #13175
  changelog: add notes about closing #13121
  ...
2018-09-11 11:04:29 +02:00
bergquist 2936e34d75 removes protoc from makefile 2018-09-11 10:53:21 +02:00
Torkel Ödegaard 61112d93d8 wip: folder to redux 2018-09-11 10:36:55 +02:00
Patrick O'Carroll 1599806b75 Merge remote-tracking branch 'origin' into 11056-folder-m 2018-09-11 09:50:15 +02:00
Carl Bergquist 2f9675b3f8 Merge pull request #13217 from mike-sol/master
Add Centrify documentation for generic_oauth
2018-09-11 09:34:48 +02:00
bergquist b8a881646a changelog: note about closing #11681 2018-09-11 09:25:08 +02:00
Carl Bergquist 5069e4eadd Merge pull request #11681 from Jonnymcc/sort-dashboard-tags
Sort results from GetDashboardTags
2018-09-11 09:19:30 +02:00
Mike Sollanych 6b0de126ce Merge pull request #1 from mike-sol/add-centrify-docs
Adding Centrify configuration for Oauth
2018-09-10 13:31:00 -07:00
Mike Sollanych 55e42b5fff Adding Centrify configuration for Oauth
Just some simple directions for configuring Centrify to enable oauth login!
2018-09-10 13:30:29 -07:00
Torkel Ödegaard 679ffbfd83 wip: progress on redux folder store 2018-09-10 21:49:04 +02:00
Torkel Ödegaard 9caa030108 Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux 2018-09-10 21:14:33 +02:00
Torkel Ödegaard 108a20196f Merge branch 'master' into teams-page-replace-mobx 2018-09-10 19:31:19 +02:00
Torkel Ödegaard 3ceab9484d wip: moving option tabs into viz tab 2018-09-10 19:04:56 +02:00
Torkel Ödegaard c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Peter Holmberg 0cfcf2685e actions for group sync 2018-09-10 16:58:17 +02:00
Torkel Ödegaard df822a660b initial render/refresh timing issues 2018-09-10 16:19:28 +02:00
Peter Holmberg b1fe0c4c7e team settings 2018-09-10 15:53:58 +02:00
Torkel Ödegaard 100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Torkel Ödegaard 59b5b146da wip: began folder to redux migration 2018-09-10 14:30:42 +02:00
Peter Holmberg 841bd5817d test for team member selector 2018-09-10 14:27:33 +02:00
Peter Holmberg d494ebc730 flattened team state, tests for TeamMembers 2018-09-10 14:19:27 +02:00
Marcus Efraimsson 35a24032a7 Merge pull request #13208 from grafana/fix-dashboard-permissions
fix: Dashboard permissions now shows correctly
2018-09-10 14:00:55 +02:00
Torkel Ödegaard 6c90a53654 refactor: moved stuff into new features dir manage-dashboards 2018-09-10 13:59:31 +02:00
Torkel Ödegaard e4d9620fc0 move: moved styleguide to admin 2018-09-10 13:38:45 +02:00
Torkel Ödegaard 0f98dcdef0 fix: fixed singlestat test broken due to file move 2018-09-10 13:34:33 +02:00
Torkel Ödegaard 17e99bb38a Merge branch 'master' of github.com:grafana/grafana 2018-09-10 13:29:57 +02:00
Torkel Ödegaard 34567bc4f1 moved folders from features into the main feature folder they belong to 2018-09-10 13:29:27 +02:00
Carl Bergquist 7e0637aa9d Merge pull request #12260 from strohi/panelids-for-htmlbookmark
added id tag to Panels for html bookmarking on longer Dashboards
2018-09-10 13:01:35 +02:00
Marcus Efraimsson 3fe3f3741f Merge pull request #13200 from svenklemm/postgres-query-builder-fixes
Fix query builder queries for interval start
2018-09-10 13:01:17 +02:00
Marcus Efraimsson 227bf85e5e Merge pull request #13184 from svenklemm/postgres-interval_ms
Fix postgres quoting to handle non-string values
2018-09-10 12:43:10 +02:00
Carl Bergquist 37af10c61f Merge pull request #13209 from metalmatze/docs-jsonnet
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:59:31 +02:00
Matthias Loibl d561104b64 Add jsonnet with grafonnet-lib to provisioning docs 2018-09-10 11:45:23 +02:00
Torkel Ödegaard 9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Torkel Ödegaard 628ef2d9a9 Update CHANGELOG.md 2018-09-10 10:43:00 +02:00
Torkel Ödegaard 267b96cb48 Merge branch 'master' of github.com:grafana/grafana 2018-09-10 09:54:30 +02:00
Torkel Ödegaard 298c088d57 Merge branch 'redux-poc2' 2018-09-10 09:54:14 +02:00
Torkel Ödegaard 5c58a7d7f4 redux: do not use redux logger middleware in production builds 2018-09-10 09:53:52 +02:00
Bob Shannon f257ff0216 Allow oauth email attribute name to be configurable (#13006)
* Allow oauth email attribute name to be configurable

Signed-off-by: Bob Shannon <bshannon@palantir.com>

* Document e-mail determination steps for generic oauth

* Add reference to email_attribute_name

* Re-add e-mail determination docs to new generic-oauth page

* Inherit default e-mail attribute from defaults.ini
2018-09-10 09:45:07 +02:00
Sven Klemm 7c78b64a36 Document required order for time series queries (#13204) 2018-09-10 09:33:06 +02:00
Torkel Ödegaard 035b0ab07a Merge branch 'master' into redux-poc2 2018-09-10 09:32:06 +02:00
Torkel Ödegaard 6bdaf57ae7 refactor: changed AlertRuleItem pause action to callback 2018-09-10 09:29:53 +02:00
Sven Klemm 116fb50530 Fix query builder queries for interval start
This changes the rate and increase queries to not calculate
a value when there is no previous value. This also adds an
order by metric column to prevent inconsistent series ordering
in the legend.
2018-09-08 08:28:15 +02:00
Peter Holmberg 59b3bfd342 team members, bug in fetching team 2018-09-07 18:01:59 +02:00
Torkel Ödegaard a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Marcus Efraimsson 7a117a6b6c release 5.2.4 2018-09-07 16:57:00 +02:00
Marcus Efraimsson c179926a27 changelog: release 5.2.4 2018-09-07 16:56:31 +02:00
Alexander Zobnin e4a488baf1 graph legend: use refactored version of scrollbar, #13175 2018-09-07 16:12:28 +03:00
Alexander Zobnin 29899003ff Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-09-07 16:07:42 +03:00
Torkel Ödegaard 4391209f7b Merge branch 'master' into redux-poc2 2018-09-07 14:49:05 +02:00
Peter Holmberg 05bfc36516 Teampages page 2018-09-07 14:32:09 +02:00
Torkel Ödegaard 35ef51dca9 refactoring: custom scrollbars PR updated, #13175 2018-09-07 14:24:33 +02:00
Alexander Zobnin 349b2787cb scrollbar: use enzyme for tests instead of react-test-renderer 2018-09-07 14:31:56 +03:00
Torkel Ödegaard 1415bed045 Merge branch 'react-custom-scrollbars-wrapper' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-react-custom-scrollbars-wrapper 2018-09-07 12:50:34 +02:00
Marcus Efraimsson 8f054e7c08 changelog: add notes about closing #13121
[skip ci]
2018-09-07 11:30:18 +02:00
Marcus Efraimsson fc597260c0 Merge pull request #13167 from holiiveira/teams-image
Alert Teams - Adding Action to view the graph by its public URL.
2018-09-07 11:24:06 +02:00
Marcus Efraimsson a1d1c4fb9a fix code formatting 2018-09-07 11:06:19 +02:00
Sven Klemm 6b863e3b0f Fix quoting to handle non-string values 2018-09-07 10:21:10 +02:00
Alexander Zobnin 8fca79e87e scrollbar refactor: replace HOC by component with children 2018-09-06 22:53:40 +03:00
Alexander Zobnin 729cc94daf graph legend: scroll component refactor 2018-09-06 22:52:56 +03:00
Alexander Zobnin e67b8a3e1a scrollbar refactor: replace HOC by component with children 2018-09-06 22:52:14 +03:00
Carl Bergquist b070784b8a adds usage stats for alert notifiers (#13173) 2018-09-06 21:03:09 +02:00
Marcus Efraimsson 44cd738dd9 changelog: typo
[skip ci]
2018-09-06 17:03:43 +02:00
Marcus Efraimsson 479e073451 docs: what's new in v5.3 placeholder 2018-09-06 15:22:03 +02:00
Alexander Zobnin a186bc01e0 tests for withScrollBar() wrapper 2018-09-06 15:37:31 +03:00
Alexander Zobnin 28cc605e32 tests for withScrollBar() wrapper 2018-09-06 15:36:22 +03:00
Marcus Efraimsson bdc3acbd2c changelog: restructure and add 5.3.0-beta1 header
[skip ci]
2018-09-06 14:21:36 +02:00
Marcus Efraimsson 3f4099c4a6 changelog: add notes about closing #13157
[skip ci]
2018-09-06 14:09:27 +02:00
Alexander Zobnin cf832e7db4 wrapper for react-custom-scrollbars component 2018-09-06 15:09:18 +03:00
Alexander Zobnin 8db2960d0d graph legend: use 'react-custom-scrollbars' for legend scroll 2018-09-06 15:06:54 +03:00
Marcus Efraimsson 26756f86aa Merge pull request #13148 from svenklemm/postgres-min-interval
Add min time interval support for SQL datasources
2018-09-06 14:05:39 +02:00
Alexander Zobnin b2ba9c5166 wrapper for react-custom-scrollbars component 2018-09-06 15:03:24 +03:00
Marcus Efraimsson db639684bb docs: sql datasources min time interval 2018-09-06 13:52:16 +02:00
bergquist 4ce41c16fc changelog: note about closing #10424 2018-09-06 13:33:38 +02:00
Carl Bergquist 3c0b1ef581 Merge pull request #13170 from bergquist/alerting_default_setting
make default values for alerting configurable
2018-09-06 13:26:42 +02:00
Torkel Ödegaard e364119774 docs: minor fixes 2018-09-06 13:21:11 +02:00
Torkel Ödegaard 320947359c Merge branch '12886-docs-authentication-section' 2018-09-06 13:16:17 +02:00
Torkel Ödegaard d6f9ebab63 docs: Updated auth docs 2018-09-06 13:15:36 +02:00
Torkel Ödegaard a25b594506 docs: updated 2018-09-06 12:13:23 +02:00
bergquist 1e33a3780f spelling errors 2018-09-06 11:51:24 +02:00
bergquist 3ce89cad71 make default values for alerting configurable 2018-09-06 11:26:14 +02:00
Henrique Oliveira e983f8f54b Adding Action to view the graph by its public URL. 2018-09-05 17:35:22 -03:00
Marcus Efraimsson d76dad86c8 changelog: order changes by group (ocd)
[skip ci]
2018-09-05 18:49:08 +02:00
Marcus Efraimsson 42d26400b1 changelog: add notes about closing #13030
[skip ci]
2018-09-05 18:47:26 +02:00
Marcus Efraimsson 81c5112259 Merge pull request #13165 from grafana/docs-docker-paths
docs: default paths in the docker container.
2018-09-05 18:01:01 +02:00
Patrick O'Carroll 2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Peter Holmberg f68ac20218 set search query action and tests 2018-09-05 16:49:36 +02:00
Leonard Gram 500a4b5f35 docs: default paths in the docker container. 2018-09-05 16:46:22 +02:00
Peter Holmberg 7e340b7aa5 delete team 2018-09-05 15:32:51 +02:00
Leonard Gram 5d87aa2fa4 Merge pull request #13031 from bergquist/golang_1.11
upgrade to golang 1.11
2018-09-05 15:31:43 +02:00
Patrick O'Carroll 25f13bd3ad added only-arrow-functions rule and changed files to follow new rule (#13154) 2018-09-05 15:28:30 +02:00
Peter Holmberg 167f009819 load teams and store in redux 2018-09-05 15:13:21 +02:00
Leonard Gram eed141fb54 build: uses 1.1.0 of the build container. 2018-09-05 15:10:57 +02:00
Peter Holmberg 306c3e6c10 creating types, actions, reducer 2018-09-05 12:34:32 +02:00
Leonard Gram 275f613050 Only authenticate logins when password is set (#13147)
* auth: never authenticate passwords shorter than 4 chars.

* auth: refactoring password length check.

* auth: does not authenticate when password is empty.

* auth: removes unneccesary change.
2018-09-05 12:12:46 +02:00
Torkel Ödegaard 0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +02:00
Torkel Ödegaard c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Sven Klemm cb526d4557 Add min time interval to mysql and mssql 2018-09-05 12:02:57 +02:00
Leonard Gram 8ea2f7f858 build: updated build-container with go1.11. 2018-09-05 11:55:28 +02:00
Torkel Ödegaard 00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Torkel Ödegaard 99133c4fbb Merge branch '12918-only-arrow-functions' 2018-09-05 11:46:46 +02:00
Torkel Ödegaard 432e203df1 Merge branch '12918-only-arrow-functions3' 2018-09-05 11:26:30 +02:00
Torkel Ödegaard 151e950e2c Merge branch 'master' into 12918-only-arrow-functions 2018-09-05 11:24:52 +02:00
Patrick O'Carroll 777010b20b added no-conditional-assignment rule and changed files to follow new rule 2018-09-05 10:53:58 +02:00
Sven Klemm e2c7b010ac fix test failures for timeInterval 2018-09-05 10:03:16 +02:00
Sven Klemm fd269945c9 document postgres min time interval 2018-09-05 09:57:09 +02:00
Sven Klemm a95453036b Add min time interval to postgres datasource 2018-09-05 09:46:22 +02:00
Patrick O'Carroll 72ab24f300 Changed functions to arrow functions for only-arrow-functions rule. (#13131) 2018-09-05 07:47:30 +02:00
Torkel Ödegaard d8b3fa01d0 mobx: removed unused SearchStore 2018-09-04 22:38:18 -07:00
Torkel Ödegaard 68767acb1c fix: Updated test 2018-09-04 13:15:45 -07:00
Torkel Ödegaard 1e5ad4da78 redux: minor changes to redux thunk actions and use of typings 2018-09-04 12:59:46 -07:00
Benjamin Schweizer 4bf8f80657 Merge remote-tracking branch 'upstream/master' 2018-09-04 17:42:15 +02:00
Marcus Efraimsson 7c88436a9b Merge pull request #13133 from grafana/13132_query_variable
Fix error when new variables created but not yet added/saved
2018-09-04 17:25:08 +02:00
Peter Holmberg cab6861d27 Reactify sidebar (#13091)
* created react component and moved markdown

* extracting components

* Broke out parts into components

* tests

* Flattened file structure

* Tests

* made instances typed in test

* typing

* function instead of variable

* updated user model with missing properties

* added full set of properties to user mock

* redone from variable to function

* refactor: minor refactorings of #13091

* removed logging
2018-09-04 17:24:08 +02:00
Patrick O'Carroll dc4f547a40 Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 17:02:32 +02:00
Peter Holmberg 41dcd7641b removed unused mobx state 2018-09-04 16:13:51 +02:00
Patrick O'Carroll 0f326f18dc changed functions to arrowfunctions for only-arrow-functions rule (#13127) 2018-09-04 15:55:41 +02:00
Torkel Ödegaard 826dfceac0 fix: fixed home dashboard redirect issue when behind reverse proxy, fixes #12429 (#13135) 2018-09-04 15:42:10 +02:00
Peter Holmberg 22510be450 tests 2018-09-04 15:00:04 +02:00
Patrick O'Carroll 19b7ad61dd Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 14:27:03 +02:00
Anthony Woods 5c0fbbf7c8 improve remote image rendering (#13102)
* improve remote image rendering

- determine "domain" during Init() so we are not re-parsing settings
  on every request
- if using http-mode via a rednererUrl, then use the AppUrl for the
  page that the renderer loads.  When in http-mode the renderer is likely
  running on another server so trying to use the localhost or even the
  specific IP:PORT grafana is listening on wont work.
- apply the request timeout via a context rather then directly on the http client.
- use a global http client so we can take advantage of connection re-use
- log and handle errors better.

* ensure imagesDir exists

* allow users to define callback_url for remote rendering

- allow users to define the url that a remote rendering service
  should use for connecting back to the grafana instance.
  By default the "root_url" is used.

* improve remote image rendering

- determine "domain" during Init() so we are not re-parsing settings
  on every request
- if using http-mode via a rednererUrl, then use the AppUrl for the
  page that the renderer loads.  When in http-mode the renderer is likely
  running on another server so trying to use the localhost or even the
  specific IP:PORT grafana is listening on wont work.
- apply the request timeout via a context rather then directly on the http client.
- use a global http client so we can take advantage of connection re-use
- log and handle errors better.

* ensure imagesDir exists

* allow users to define callback_url for remote rendering

- allow users to define the url that a remote rendering service
  should use for connecting back to the grafana instance.
  By default the "root_url" is used.

* rendering: fixed issue with renderKey where userId and orgId was in mixed up, added test for RenderCallbackUrl reading logic
2018-09-04 13:42:55 +02:00
Marcus Efraimsson 1e74d7f20a handle new variables created not yet added 2018-09-04 13:25:44 +02:00
Marcus Efraimsson ce538007d8 changelog: add notes about closing #10095
[skip ci]
2018-09-04 12:31:11 +02:00
Marcus Efraimsson 7e527de5f1 Merge pull request #11081 from svenklemm/postgres-query-builder
postgres: graphical query builder
2018-09-04 12:24:10 +02:00
Alexander Zobnin b891a858ca graph legend: implement series toggling and sorting 2018-09-04 12:52:02 +03:00
Marcus Efraimsson 8fcc9b1891 docs: postgres provisioning 2018-09-04 11:33:43 +02:00
Marcus Efraimsson f15f4425d3 Merge pull request #12854 from grafana/12853-empty-team-list
[wip]added empty list cta to team list
2018-09-04 11:10:32 +02:00
bergquist eb7172c3d4 changelog: adds note about closing #13125 2018-09-04 11:09:16 +02:00
Carl Bergquist 2f6af7b811 Merge pull request #13125 from overcookedpanda/master
added Bitcoin as a currency option
2018-09-04 11:07:49 +02:00
Patrick O'Carroll eca7b76290 fixed title prefix, fixes #13123 (#13128) 2018-09-04 10:33:18 +02:00
Torkel Ödegaard 16fb01ed81 Update CHANGELOG.md 2018-09-04 10:32:57 +02:00
maicon a6aa219895 Reopen log files after receiving a SIGHUP signal (#13112)
* Reopen log files after receiving a SIGHUP signal

Implements a system signals listener in log.FileLogWriter.

After receiving a SIGHUP signal from the system, the listener will close the current log file and then open it again.

The listener will finishes after receiving a SIGINT, SIGKILL or SIGTERM signal.

Closes grafana/grafana#2497

* Move the SIGHUP handling to the main file
2018-09-04 10:31:41 +02:00
Peter Holmberg 5ac5a08e9e Fixed a bug in the test and added test for filter alert rules 2018-09-04 09:53:24 +02:00
Patrick O'Carroll 0e007d573d changed functions to arrowfunctions for only-arrow-functions rule 2018-09-04 09:53:07 +02:00
Alexander Zobnin e8a52117a5 graph legend: react component refactor 2018-09-04 10:37:23 +03:00
Overcooked Panda 4ab3826a08 added Bitcoin as a currency option 2018-09-03 22:02:58 -05:00
Sven Klemm 82e601250d Merge branch 'master' into postgres-query-builder 2018-09-03 22:05:53 +02:00
Patrick O'Carroll dac2c62545 added new-parens rule (#13119) 2018-09-03 20:36:01 +02:00
Torkel Ödegaard b0134d30ae Update CHANGELOG.md 2018-09-03 20:35:28 +02:00
Carl Bergquist ee1083d9b4 cli: avoid rely on response.ContentLength (#13120)
response.ContentLength might be invalid if the http response
is chunked.

fixes #13079
2018-09-03 20:33:21 +02:00
Peter Holmberg f4594c8320 some basic selector tests 2018-09-03 16:58:11 +02:00
Benjamin Schweizer f4b29b5782 fixed testcase 2018-09-03 16:08:52 +02:00
Benjamin Schweizer 82554ffd67 Merge remote-tracking branch 'upstream/master' 2018-09-03 15:55:44 +02:00
Peter Holmberg 638370e310 pausing alert
need to fix return type on dispatch. Could not test correctly either.
2018-09-03 15:44:39 +02:00
Marcus Efraimsson db2264c554 docs: v5.2 upgrade notice, ref #13084 2018-09-03 15:12:17 +02:00
Marcus Efraimsson c1efa13018 changelog: add notes about closing #7330
[skip ci]
2018-09-03 14:56:50 +02:00
Marcus Efraimsson 1ceca5d8ec Merge pull request #12145 from grafana/alerting_reminder
Alerting notification reminder
2018-09-03 14:41:38 +02:00
Peter Holmberg c958ebd101 extend from purecomponent 2018-09-03 14:05:12 +02:00
Peter Holmberg 1994ca5016 remove log 2018-09-03 14:04:44 +02:00
Peter Holmberg 50444c32e0 actions and reducers for search filter 2018-09-03 13:46:39 +02:00
Sven Klemm de917dfc4d Merge branch 'master' into postgres-query-builder 2018-09-03 13:43:58 +02:00
Patrick O'Carroll f8c2b23c86 added rule use-isnan and and updated file to follow new rule (#13117) 2018-09-03 13:31:37 +02:00
Patrick O'Carroll ebf253d26a added no-namespace and no-reference rules (#13116) 2018-09-03 12:46:25 +02:00
Patrick O'Carroll b8d82df97e added no-angle-bracket-type-assertion rule and updatet files to follow rule (#13115) 2018-09-03 11:30:44 +02:00
Patrick O'Carroll 7837ee4466 Updated rules for variable name (#13106)
* updated rules for variable name and fixed files that didn't follow new rules

* fixed test so it uses new rule

* made exceptions to rule in interval_variable
2018-09-03 11:00:46 +02:00
Jordan Hamel 0d25aa08fa update wording and punctuation (#13113)
* word fix

support >> supports 
says >> ways

* : for emphasis
2018-09-03 07:58:45 +02:00
Torkel Ödegaard 42aaa2b907 redux: improved state handling 2018-09-02 12:14:41 -07:00
Torkel Ödegaard 3fd707f321 redux: progress 2018-09-02 12:08:31 -07:00
Torkel Ödegaard 2a64d19f5b wip: load alert rules via redux 2018-09-02 11:36:03 -07:00
Torkel Ödegaard 7b06800295 refactor: changed nav store to use nav index and selector instead of initNav action 2018-09-02 10:36:36 -07:00
Torkel Ödegaard 2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Simon Podlipsky e67d3df14c Fix array display from url 2018-09-01 14:13:48 +02:00
Torkel Ödegaard de456f8b73 wip: solid progress on redux -> angular location bridge update 2018-08-31 13:16:20 -07:00
Sven Klemm 265d5daf57 Merge branch 'master' into postgres-query-builder 2018-08-31 19:02:46 +02:00
Torkel Ödegaard 6efe9da10f wip: moving things around 2018-08-31 09:49:32 -07:00
Torkel Ödegaard 2c85e44ab7 wip: moveing things around 2018-08-31 09:49:02 -07:00
Torkel Ödegaard 593cc5380f wip: redux refactor 2018-08-31 09:42:32 -07:00
Sven Klemm bcfb841cb4 pass timerange in meta data queries 2018-08-31 18:24:09 +02:00
Sven Klemm cd708d6cb2 ignore information_schema tables 2018-08-31 16:52:26 +02:00
Patrick O'Carroll abbb6f933c added jsdoc-format rule and fixed files that didn't follow new rule (#13107) 2018-08-31 16:40:43 +02:00
Patrick O'Carroll 944c1da27b set member-access and no-var-keyword to true, removed public in two files (#13104) 2018-08-31 16:40:23 +02:00
Torkel Ödegaard eef41cbccd Merge branch 'grafana-loading-page' 2018-08-31 07:38:42 -07:00
Torkel Ödegaard 2996c54b72 fix: for text flickering in animation on chrome on windows 2018-08-31 07:37:21 -07:00
Alexander Zobnin 60146109ab graph legend: minor refactor 2018-08-31 17:27:57 +03:00
Sven Klemm 8d73f53e97 use quoting functions from MysqlQuery in datasource 2018-08-31 16:27:48 +02:00
Sven Klemm 390472aa99 render query from query builder 2018-08-31 15:40:58 +02:00
Alexander Zobnin 329f39e4d7 graph: make table markup corresponding to standards 2018-08-31 16:34:22 +03:00
Alexander Zobnin 0e10fdb415 graph: legend as React component 2018-08-31 16:32:05 +03:00
Torkel Ödegaard d68007fde3 wip: redux 2018-08-31 14:38:23 +02:00
Torkel Ödegaard cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +02:00
Patrick O'Carroll c9995d39d7 fixed so preloader is removed when app is loaded 2018-08-31 09:57:27 +02:00
Patrick O'Carroll 4f84a2d018 removed console.log 2018-08-31 08:50:34 +02:00
Patrick O'Carroll bc30e7b322 separated fade-ins for logo and text, tweaked delays and timing for fade-in animations 2018-08-31 08:41:17 +02:00
Torkel Ödegaard 4f91087d9a docs: minor updates, more work to do 2018-08-31 07:15:07 +02:00
Torkel Ödegaard ad9f38ae4d Merge branch 'master' into redux-poc2 2018-08-30 13:04:29 -07:00
Torkel Ödegaard 77f9b152fa ux: minor fixes to loading screen 2018-08-30 11:59:32 -07:00
Marcus Efraimsson 41b5dae606 start implementing mysql query editor as a copy of postgres query editor 2018-08-30 16:52:12 +02:00
Sven Klemm 650e2faf01 Merge branch 'postgres-query-builder' of git+ssh://github.com/svenklemm/grafana into postgres-query-builder 2018-08-30 15:47:10 +02:00
Sven Klemm d5cdeebf23 reset metric column when changing table 2018-08-30 15:46:57 +02:00
Sven Klemm 88cd713d3a reset metric column when changing table 2018-08-30 15:45:05 +02:00
Sven Klemm 1cac061448 fix timeFilter resetting when changing table 2018-08-30 15:39:01 +02:00
Marcus Efraimsson 5ceaa21e3b when changing table, refresh panel once after columns have been changed 2018-08-30 15:11:54 +02:00
Patrick O'Carroll 6832b80735 added pro-tip text, removed pro-tip link 2018-08-30 15:02:20 +02:00
Patrick O'Carroll f916add03b fixed styling for background and text, added intro animation, added fade in to text 2018-08-30 14:44:37 +02:00
Sven Klemm a06a6b6517 fix timecolumn handling when table changes 2018-08-30 14:25:27 +02:00
Sven Klemm 015909dbff set default for timeGroup in query builder to $__interval 2018-08-30 14:16:42 +02:00
Sven Klemm 483f6cc5e1 when changing table reset columns 2018-08-30 14:11:53 +02:00
Sven Klemm be978d1a8f fix metric column suggestions 2018-08-30 14:09:47 +02:00
Sven Klemm e2c3b6c6c5 fix suggestions for metric column 2018-08-30 13:05:16 +02:00
Jasper Lievisse Adriaanse d668a922e6 Return correct path for OpenBSD in cli's returnOsDefault (#13089) 2018-08-30 11:56:52 +02:00
Torkel Ödegaard 9cf26b934d updated changelog 2018-08-30 11:55:54 +02:00
Torkel Ödegaard 154fbe2413 New TV Mode, dashboard toolbar update (layout change & new cycle view mode button) (#13025)
* wip: design update for navbar with kiosk mode button

* feat: progress on new view mode button

* css: view state refactorings

* feat: kiosk modes & playlist support

* feature: cycle tv mode feature, renamed view modes to TV, and Kiosk

* fix: updated the alert notification message

* fix: removed unused parameter

* fix: correct the css class set for tv mode

* some minor improvements to playlist
2018-08-30 11:52:31 +02:00
Torkel Ödegaard 36bc8b77fb Merge branch 'tsconfig-no-implicit-this' 2018-08-30 11:46:13 +02:00
Patrick O'Carroll a8547ae36e added this:any to functions and changed functions to arrowfunctions 2018-08-30 10:49:18 +02:00
Torkel Ödegaard dd8076f2cf feat: loading css async & inline svg 2018-08-30 10:32:45 +02:00
David b8e6817732 Explore: keep query when changing datasources (#13042)
- clear `edited` state for each query when a new datasource is set
2018-08-30 09:05:45 +02:00
Patrick O'Carroll 552a61b6ae changed var to let in 50 files (#13075) 2018-08-30 09:03:11 +02:00
Patrick O'Carroll b494a29e02 changed var to let in last files (#13087) 2018-08-30 08:58:43 +02:00
Torkel Ödegaard 80d6ef535d tsconfig: started on setting noImplicitThis to true 2018-08-30 08:53:13 +02:00
Torkel Ödegaard ceadced6f0 tsconfig: format file 2018-08-30 08:33:29 +02:00
Sven Klemm aa2098fedf document postgres version and TimescaleDB option 2018-08-30 08:18:22 +02:00
Torkel Ödegaard c960af098a tslint: added 1 more rule, #12918 2018-08-30 07:47:46 +02:00
Torkel Ödegaard 0bb249096f tslint: added 2 more rules and removed unused component, #12918 2018-08-30 07:40:13 +02:00
Torkel Ödegaard 272c09513f tslint: added a new tslint rule 2018-08-30 07:34:17 +02:00
ryan 048fd87a54 Merge remote-tracking branch 'grafana/master'
* grafana/master:
  added rule prefer const to tslint (#13071)
  dep ensure (#13074)
  changed var to const 2 (#13068)
  changed var to const (#13061)
  update latest.json to latest stable version
  docs: corrected docs description for setting
  changelog: add notes about 4.6.4 and 5.2.3 releases
2018-08-29 22:20:53 -07:00
Patrick O'Carroll 0dc8949352 added rule prefer const to tslint (#13071) 2018-08-30 07:18:28 +02:00
Šimon Podlipský 2e1db2ca93 dep ensure (#13074) 2018-08-30 07:18:09 +02:00
Sven Klemm aadff18e94 hide Query Builder button for table panels 2018-08-29 18:38:18 +02:00
Sven Klemm a87b27c7d3 check for correct quoting of multiple singlequotes 2018-08-29 16:50:59 +02:00
Sven Klemm 70daa56a31 Merge branch 'master' into postgres-query-builder 2018-08-29 14:44:23 +02:00
Patrick O'Carroll a702603e7b changed var to const 2 (#13068)
* changed var to const

* fixed typo created in last commit

* added or empty object to options in prometheus/datasource
2018-08-29 14:27:29 +02:00
Patrick O'Carroll 5e0d0c5816 changed var to const (#13061) 2018-08-29 14:26:50 +02:00
Torkel Ödegaard 9423e3e124 Merge branch 'master' of github.com:grafana/grafana 2018-08-29 13:34:11 +02:00
Marcus Efraimsson 800ba84f67 update latest.json to latest stable version 2018-08-29 13:29:29 +02:00
Torkel Ödegaard 1e2fde238c docs: corrected docs description for setting 2018-08-29 13:26:23 +02:00
Sven Klemm 1ee91a637f remove min time interval from datasource config 2018-08-29 13:02:25 +02:00
Sven Klemm 0b74ff5cf1 remove unneeded queryOptions 2018-08-29 12:51:58 +02:00
Marcus Efraimsson 10f55f5511 changelog: add notes about 4.6.4 and 5.2.3 releases 2018-08-29 12:34:27 +02:00
Sven Klemm 7a5b5906ed fix quoting 2018-08-29 12:24:28 +02:00
Sven Klemm bfac6303d0 strip quotes when auto adding alias 2018-08-29 12:16:07 +02:00
Sven Klemm ab4fbff454 handle quoting properly for table suggestion 2018-08-29 12:12:11 +02:00
Sven Klemm e9ab4feeb0 link to github instead 2018-08-29 09:58:08 +02:00
Sven Klemm 955e5afa45 recheck timecolumn when changing table 2018-08-29 09:51:01 +02:00
Sven Klemm 84ec1ce624 update filter macro on time column change 2018-08-29 09:04:33 +02:00
ryan 8cfad74af3 Merge remote-tracking branch 'grafana/master'
* grafana/master: (52 commits)
  Moved tooltip icon from input to label #12945 (#13059)
  added empty cta to playlist page + hid playlist table when empty (#12841)
  Update provisioning.md
  changelog: add notes about closing #12865
  fixed so validation of empty fields works again
  tslint: tslint to const fixes part3 (#13036)
  tslint: more const fixes (#13035)
  tslint: changing vars -> const (#13034)
  tslint: autofix of let -> const (#13033)
  WIP Update tslint (#12922)
  changelog: add notes about closing #12952 #12965
  build: fixes rpm build when using defaults.
  changelog: add notes about closing #12486
  docs: changes
  fixed so animation starts as soon as one pushes the button and animation stops if login failed
  added link to getting started to all, changed wording
  tests: fix missing tests (with .jest suffix)
  heatmap: fix tooltip bug in firefox
  Update notifications.md
  sql: added code migration type
  ...
2018-08-28 20:43:40 -07:00
bergquist 12c9860882 string formating fixes 2018-08-28 22:33:38 +02:00
bergquist ff7b0d4f63 go fmt fixes 2018-08-28 22:14:15 +02:00
Peter Holmberg b6584f5ad0 Moved tooltip icon from input to label #12945 (#13059) 2018-08-28 15:23:25 +02:00
Marcus Efraimsson 26bb91296d Merge pull request #13056 from LuboVarga/patch-1
Update provisioning.md
2018-08-28 14:44:10 +02:00
Patrick O'Carroll b8597b4d57 added empty cta to playlist page + hid playlist table when empty (#12841)
* added empty cta to playlist page + hid playlist table when empty

* implemented the empty-list-cta component

* removed extra protip, changed messaging
2018-08-28 14:23:03 +02:00
Patrick O'Carroll 8bdabad86e changed from rotating to bouncing, maybe to much squash and stretch 2018-08-28 13:51:12 +02:00
LuboVarga 13f4d09ed8 Update provisioning.md
wrong data type was mentioned in table for esVersion field. I expect to regenerate doc here: http://docs.grafana.org/administration/provisioning/#datasources
This problem was noted by @stefanes a while ago here: https://github.com/grafana/grafana/issues/11126#issuecomment-370799209
2018-08-28 13:37:55 +02:00
Sven Klemm 30fce34d9c make default mode for table panels raw editor 2018-08-28 12:10:55 +02:00
Marcus Efraimsson f55aad0ec9 Merge pull request #12919 from grafana/11580-how-to-start-grafana-docs
docs: How to get started with Grafana for the first time
2018-08-28 11:01:00 +02:00
Sven Klemm 62d82920e6 improve description for timescaledb option 2018-08-27 23:20:17 +02:00
Mitsuhiro Tanda bf8840255c Review feedback. 2018-08-28 01:12:50 +09:00
Mitsuhiro Tanda e62c083cf0 use series matchers to get label name/value 2018-08-28 01:12:50 +09:00
Marcus Efraimsson c7279a4e07 changelog: add notes about closing #12865
[skip ci]
2018-08-27 15:19:22 +02:00
Marcus Efraimsson e204124791 Merge pull request #12939 from grafana/12865-login-loading-animation
animation during slow login
2018-08-27 15:17:19 +02:00
Patrick O'Carroll 1a2ab532d1 fixed so validation of empty fields works again 2018-08-27 14:16:34 +02:00
Patrick O'Carroll 5ff5c5c245 added a loading view with a spining grafana logo 2018-08-27 13:54:26 +02:00
Sven Klemm 7177f19436 Merge branch 'master' into postgres-query-builder 2018-08-27 11:23:55 +02:00
Sven Klemm da8696ed95 fix handling of variable interpolation for IN expresions 2018-08-26 22:43:03 +02:00
Torkel Ödegaard e1beaaa0f7 tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard 35c00891e7 tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard 314b645857 tslint: changing vars -> const (#13034) 2018-08-26 18:43:07 +02:00
Torkel Ödegaard 9b978b7203 tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Torkel Ödegaard 864c4691da fix: minor fix to changing type 2018-08-25 12:38:25 -07:00
bergquist fda9790ba5 upgrades to golang 1.11 2018-08-25 21:23:20 +02:00
Torkel Ödegaard fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Sven Klemm 21e7b0b92d add min interval to postgres datasource 2018-08-25 18:14:39 +02:00
Torkel Ödegaard 6ba8f6c5ab wip: major change for refresh and render events flow 2018-08-25 08:49:39 -07:00
Torkel Ödegaard 4424bdd1b1 fix: going from fullscreen fix 2018-08-25 07:37:37 -07:00
Torkel Ödegaard 91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Marcus Efraimsson 6995242b8b copy and docs update for alert notification reminders 2018-08-24 19:13:52 +02:00
Marcus Efraimsson eba147c1a3 change/add tests for alerting notification reminders 2018-08-24 19:09:19 +02:00
Torkel Ödegaard 1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard 0b794ff685 Merge branch 'master' into react-panels 2018-08-24 17:29:10 +02:00
Tobias Skarhed 8a99fa269d WIP Update tslint (#12922)
* Interface linting rule

* fix: changed model names in store files so that the interface names do not conflict with the model names
2018-08-24 16:48:47 +02:00
Marcus Efraimsson e906d4bdba changelog: add notes about closing #12952 #12965
[skip ci]
2018-08-24 15:55:20 +02:00
Marcus Efraimsson 49f9276df0 Merge pull request #12967 from franciscocpg/custom-all-value-variable-interpolation
Replacing variable interpolation in "All value" value
2018-08-24 15:40:55 +02:00
Leonard Gram 5bb0d26604 build: fixes rpm build when using defaults.
Closes #12980
2018-08-24 15:23:49 +02:00
Marcus Efraimsson 51069c9ccb docs: reminder notifications update 2018-08-23 18:56:37 +02:00
Marcus Efraimsson a9497f0a96 changelog: add notes about closing #12486
[skip ci]
2018-08-23 18:30:28 +02:00
Marcus Efraimsson a04d531d35 Merge pull request #12999 from alexanderzobnin/fix-12486-cherry-pick
Heatmap: fix tooltip and crosshair in firefox
2018-08-23 18:27:59 +02:00
Marcus Efraimsson b218290f3a docs: changes 2018-08-23 17:39:39 +02:00
Patrick O'Carroll 76bd173a36 created a section under administration for authentication, moved ldap guide here, created pages for auth-proxy, oauth, anonymous auth, ldap sync with grafana ee, and overview, moved authentication guides from configuration to, added linksin configuration page to guides 2018-08-23 15:58:37 +02:00
Patrick O'Carroll 050902a1e7 fixed so animation starts as soon as one pushes the button and animation stops if login failed 2018-08-23 15:31:25 +02:00
Patrick O'Carroll d38c159893 added link to getting started to all, changed wording 2018-08-23 14:39:50 +02:00
Sven Klemm ea110b5931 Merge branch 'master' into postgres-query-builder 2018-08-23 14:33:55 +02:00
Marcus Efraimsson 4db480ad7e Merge pull request #13012 from alexanderzobnin/fix-missing-jests
tests: fix missing tests (with .jest suffix)
2018-08-23 12:46:38 +02:00
Alexander Zobnin 060fb1af05 tests: fix missing tests (with .jest suffix) 2018-08-23 13:00:15 +03:00
Marcus Efraimsson 34e448c6d4 Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-22 18:08:50 +02:00
Marcus Efraimsson 2e1c4b3d76 docs: alerting notification reminders 2018-08-22 18:06:51 +02:00
Marcus Efraimsson 15d950ce35 update copy/ux for configuring alerting notification reminders 2018-08-22 18:06:05 +02:00
Alexander Zobnin 8dc1675574 heatmap: fix tooltip bug in firefox 2018-08-22 15:36:17 +03:00
Sven Klemm 1b5486ae7f Merge branch 'master' into postgres-query-builder 2018-08-21 21:58:04 +02:00
Sven Klemm 02c5d36c0b fix tableSegment and timeColumnSegment after table suggestion 2018-08-21 20:12:45 +02:00
Marcus Efraimsson 97fbf5c033 Merge pull request #12994 from stefanes/patch-2
Update notifications.md
2018-08-21 18:23:03 +02:00
Stefan 2b1f84cd43 Update notifications.md 2018-08-21 15:53:57 +02:00
Torkel Ödegaard 5f81c879fa Merge branch 'code-migrations' 2018-08-21 13:53:46 +02:00
Torkel Ödegaard 92ed1f04af sql: added code migration type 2018-08-21 13:53:04 +02:00
Marcus Efraimsson eef0d28082 changelog: add notes about closing #11890
[skip ci]
2018-08-21 10:51:38 +02:00
Marcus Efraimsson 775e95bde4 Merge pull request #12959 from grafana/11890_variables
Fix: Template variables are executing excessive queries
2018-08-21 10:40:47 +02:00
Marcus Efraimsson 6ace01fbed Merge pull request #12893 from grafana/davkal/12889-explore-fix-rate-filter
Explore: Fix label filtering for rate queries
2018-08-21 10:37:38 +02:00
Marcus Efraimsson dc60848319 Merge pull request #12876 from grafana/davkal/explore-rate-hinting
Explore: still show rate hint if query is complex
2018-08-21 10:37:12 +02:00
Marcus Efraimsson c970e1e4b8 Merge pull request #12874 from grafana/davkal/explore-facetting-filtered
Explore: Filter out existing labels in label suggestions
2018-08-21 09:59:53 +02:00
Marcus Efraimsson dd796bfbe3 Merge remote-tracking branch 'origin/master' into davkal/12889-explore-fix-rate-filter 2018-08-21 09:51:17 +02:00
Marcus Efraimsson 75db4d8eee Merge remote-tracking branch 'origin/master' into davkal/explore-rate-hinting 2018-08-21 09:48:07 +02:00
Marcus Efraimsson 8f875951cb Merge remote-tracking branch 'origin/master' into davkal/explore-facetting-filtered 2018-08-21 09:40:39 +02:00
Marcus Efraimsson 352a26780c Merge pull request #12873 from grafana/davkal/explore-fix-split
Explore: Fix initial state in split view
2018-08-21 09:38:06 +02:00
David 6316d637f1 Explore: Apply tab completion suggestion on Enter (#12904)
- if the suggestions menu is open, apply the selected item on Enter
- if not open, run the queries
2018-08-20 19:22:55 +02:00
Pierre GIRAUD 72efd73c3b Show min-width option only for horizontal repeat (#12981) 2018-08-20 19:22:30 +02:00
Pierre GIRAUD cf632c0f11 Fix bulk-dashboards path (#12978) 2018-08-20 19:21:31 +02:00
Marcus Efraimsson 470e7cc6db add suggestions for reminder frequency and change copy 2018-08-20 18:23:48 +02:00
Marcus Efraimsson dfa5d17670 don't write to notification journal when testing notifier/rule 2018-08-20 16:27:13 +02:00
Marcus Efraimsson 86bc462bc1 remove unnecessary conversion (metalinter) 2018-08-20 13:35:36 +02:00
Marcus Efraimsson 3350a3477d fix after merge with master 2018-08-20 13:31:06 +02:00
Marcus Efraimsson 6d2136b853 Merge remote-tracking branch 'origin/master' into alerting_reminder 2018-08-20 13:29:30 +02:00
Marcus Efraimsson 887387cda8 Merge pull request #12974 from grafana/ds-proxy-json-data
dsproxy: interpolate route url
2018-08-20 13:22:57 +02:00
Francisco Guimarães 0223a75de0 Refresh query variable when another variable is used in regex field (#12961) 2018-08-20 11:56:12 +02:00
Pierre GIRAUD a92d51731d Webpack tapable plugin deprecation (#12960)
* Remove unrequired extract-text-webpack-plugin

* Update ngAnnotate to avoid deprecation warning

* Avoid deprecation warning (Tapable.plugin -> hooks)
2018-08-20 11:55:29 +02:00
Sven Klemm e04127e430 unify quoting 2018-08-18 16:09:12 +02:00
Daniel Lee c75e071213 dsproxy: interpolate route url
Allows for dynamic urls for plugin routes. There are a few plugins
where the route url should be configurable and this change allows
using jsonData fields in the url field for a route in the
plugin.json file for a plugin.
2018-08-18 16:02:49 +02:00
Sven Klemm 49319fbdea prefill editor with first metric table 2018-08-18 13:21:08 +02:00
Sven Klemm ff2564900f only allow 1 filter macro in where clause 2018-08-18 12:34:19 +02:00
Sven Klemm c1890dbb6d fix timeColumnType assignment 2018-08-18 12:28:05 +02:00
Sven Klemm 9699d7a166 make suggested filter macro depend on type 2018-08-18 12:11:10 +02:00
Sven Klemm 18ce6fc280 use unixEpochGroup macro for unix timestamp 2018-08-18 12:04:32 +02:00
Sven Klemm 998bb6ebe3 Merge branch 'master' into postgres-query-builder 2018-08-18 11:54:39 +02:00
Leonard Gram da2822c88d alerting: inline docs for the slack channel.
Related to #12944
2018-08-17 16:49:27 +02:00
Francisco Guimarães d58986872c Replacing variable interpolation in "All value" value 2018-08-17 11:04:32 -03:00
Marcus Efraimsson bcd876f88e changelog: add notes about closing #12229
[skip ci]
2018-08-17 15:40:44 +02:00
Marcus Efraimsson 88b96fbd15 Merge pull request #12921 from grafana/12229_provisioning
Provisioning: Should allow one default datasource per organisation
2018-08-17 15:37:32 +02:00
Marcus Efraimsson 2bb87446be Merge pull request #12955 from grafana/12951-login-buttons
Login button issue in light theme
2018-08-17 15:31:31 +02:00
Marcus Efraimsson 0a7be2618e cleaning up test data 2018-08-17 15:00:37 +02:00
Marcus Efraimsson e3b585d862 changelog: add notes about closing #12892
[skip ci]
2018-08-17 14:44:29 +02:00
Marcus Efraimsson 313a8bd033 Merge pull request #12891 from svenklemm/unixepochgroup
add $__unixEpochGroup and $__unixEpochGroupAlias to sql datasources
2018-08-17 14:41:33 +02:00
Marcus Efraimsson eaa169cc47 docs: es versions supported 2018-08-17 14:40:50 +02:00
Marcus Efraimsson 492f5cac92 devenv: update sql dashboards 2018-08-17 14:26:28 +02:00
Marcus Efraimsson d6ad1ced6d when value in variable changes, identify which variable(s) to update
Given you have variables a, b, c, d where b depends on a, c depends on b, c, d depends on a.
When updating a only an update of b and d should be triggered since c depends on b
and c will be updated eventually when the update of b are finished.
2018-08-17 12:20:21 +02:00
Marcus Efraimsson c76513119b Merge pull request #12947 from pgiraud/patch-1
Doc - fix broken link
2018-08-17 11:21:04 +02:00
Sven Klemm 4acf4f9d36 Merge branch 'master' into postgres-query-builder 2018-08-17 10:54:44 +02:00
Patrick O'Carroll 190432296d removed inverse btn styling and added bgColor to generic oauth and grafana.com login buttons, added styling so log in button uses dark theme inverse btn styling both for dark and light theme 2018-08-17 10:40:57 +02:00
Sven Klemm 8e4db8cc3a suggest operators depending on datatype 2018-08-17 10:38:23 +02:00
Pierre GIRAUD d06c8c0e68 Doc - fix title level 2018-08-17 10:29:45 +02:00
Pierre GIRAUD ea704fcf9b Update doc about repeating panels
There's no per-row contextual menu anymore
Instead there's a  option
2018-08-17 10:29:45 +02:00
Pierre GIRAUD 04d50fb405 Doc - fix broken link 2018-08-17 10:00:17 +02:00
Leonard Gram cc50cfd9d3 build: beta versions no longer tagged as latest.
Closes #12862
2018-08-16 14:03:49 +02:00
Leonard Gram 0ce8a6a69d docs: cleanup. 2018-08-16 13:48:19 +02:00
Leonard Gram d244b59cc1 docs: docker and restarts.
Closes #10784
2018-08-16 13:48:19 +02:00
Sven Klemm 28f97a2450 update persisted parts on param change 2018-08-16 13:23:38 +02:00
Sven Klemm e84a1cbcc5 persist datatype information 2018-08-16 12:50:32 +02:00
Sven Klemm 8ced29a0e7 Don't do value suggestions for numeric and timestamp 2018-08-16 11:48:36 +02:00
Patrick O'Carroll 8877200ef4 created a class for loading buttons, added a button for when login slow on login page 2018-08-16 10:58:47 +02:00
ryan 8c86a1c4a9 Merge remote-tracking branch 'grafana/master'
* grafana/master: (187 commits)
  build: duplicate docker run-script removed.
  Set User-Agent header in all proxied datasource requests
  docs: cloudwatch dimensions reference link.
  docs: remove message property in response from get alerts http api
  changelog: add notes about closing #5623
  build: cleanup
  build: fixes rpm verification.
  docs: add grafana version note for gitlab oauth
  docs: gitlab: add note about more restrictive API scope
  social: gitlab_oauth: set user ID in case email changes
  docs: document GitLab authentication backend
  social: add GitLab authentication backend
  build: verifies the rpm packages signatures.
  changelog: add notes about closing #12224
  docs: update
  feat: add auto fit panels to shortcut modal, closes #12768
  changelog: add notes about closing #12680
  docs: update postgres provisioning
  Remove dependencies
  Rename test files
  ...
2018-08-15 18:02:34 -07:00
Marcus Efraimsson 8af80b323a Merge pull request #12909 from grafana/ds-user-agent
Set User-Agent header in datasource proxied requests
2018-08-15 16:59:29 +02:00
Sven Klemm 735c4abe6c rename postgres_query.jest.ts to .test.ts 2018-08-15 12:06:32 +02:00
Sven Klemm 907e8fd77c fix variable escaping 2018-08-15 11:37:30 +02:00
Sven Klemm a2f4441f9d autodetect timescaledb when version >= 9.6 2018-08-15 10:42:15 +02:00
Leonard Gram 713fac8e78 build: duplicate docker run-script removed. 2018-08-15 10:32:39 +02:00
Sven Klemm 2d12801186 detect postgres version for saved datasources 2018-08-15 09:48:06 +02:00
Marcus Efraimsson 13921902b5 Set User-Agent header in all proxied datasource requests
Header value will be Grafana/%version%, i.e. Grafana/5.3.0
2018-08-15 09:46:59 +02:00
Sven Klemm 2606f6e715 use pointer cursor for buttons in query editor 2018-08-15 09:21:17 +02:00
Marcus Efraimsson b8671b201e Merge pull request #12879 from anwar6953/patch-1
Fix typo
2018-08-14 22:56:00 +02:00
Leonard Gram 6a8b1e14cc docs: cloudwatch dimensions reference link. 2018-08-14 16:42:20 +02:00
Sven Klemm 6d8ad3b076 require postgres 9.4+ for ordered set aggregate functions 2018-08-14 15:49:37 +02:00
Sven Klemm 9d022766ee add postgres version to datasource config 2018-08-14 15:45:55 +02:00
Sven Klemm c90eb45cef only show first/last aggregate when timescaledb is enabled 2018-08-14 15:29:29 +02:00
Sven Klemm e12d07dd68 keep jsonData in PostgresDatasource 2018-08-14 15:27:58 +02:00
Marcus Efraimsson c5c518fd17 docs: remove message property in response from get alerts http api
Fixes #12524
2018-08-14 15:17:29 +02:00
Sven Klemm 5b3b0295e8 Merge branch 'master' into postgres-query-builder 2018-08-14 15:10:16 +02:00
Marcus Efraimsson ad1cf6c2b8 changelog: add notes about closing #5623
[skip ci]
2018-08-14 14:55:07 +02:00
Marcus Efraimsson d0d6f44dee Merge pull request #11314 from BenoitKnecht/gitlab-integration
GitLab authentication backend
2018-08-14 14:50:49 +02:00
Leonard Gram 570d2fede3 build: cleanup 2018-08-14 14:48:26 +02:00
Marcus Efraimsson aed89b49c0 should allow one default datasource per organisation using provisioning 2018-08-14 14:48:14 +02:00
Leonard Gram e521e7b76d build: fixes rpm verification. 2018-08-14 14:24:04 +02:00
Marcus Efraimsson 189de87619 docs: add grafana version note for gitlab oauth 2018-08-14 14:24:02 +02:00
Benoît Knecht 5a91e670d8 docs: gitlab: add note about more restrictive API scope
If `allowed_groups` is not used with GitLab authentication, the
*read_user* scope can be used instead of *api*.
2018-08-14 14:11:48 +02:00
Benoît Knecht ce804e9981 social: gitlab_oauth: set user ID in case email changes
Set `BasicUserInfo.Id` in the value returned by
`SocialGitlab.UserInfo()`, in case the email address of the user changes
in GitLab. That way, the user association won't be lost in Grafana.
2018-08-14 14:11:48 +02:00
Benoît Knecht 47cb0c47fd docs: document GitLab authentication backend 2018-08-14 14:11:48 +02:00
Benoît Knecht 7ec146df99 social: add GitLab authentication backend
GitLab could already be used as an authentication backend by properly
configuring `auth.generic_oauth`, but then there was no way to authorize
users based on their GitLab group membership.

This commit adds a `auth.gitlab` backend, similar to `auth.github`, with
an `allowed_groups` option that can be set to a list of groups whose
members should be allowed access to Grafana.
2018-08-14 14:11:48 +02:00
Leonard Gram aefcb06ff8 build: verifies the rpm packages signatures.
Closes #12370
2018-08-14 13:45:20 +02:00
Marcus Efraimsson 332e59d314 changelog: add notes about closing #12224
[skip ci]
2018-08-14 13:42:18 +02:00
Patrick O'Carroll e6ea8f7e0b added guide for logging in to grafana for the first and how to add a datasource 2018-08-14 13:21:52 +02:00
Marcus Efraimsson 660530a3a6 Merge pull request #12914 from dehrax/12224-final
Karma to Jest: rename and cleanup
2018-08-14 12:55:23 +02:00
Sven Klemm 15c8ef6c95 Merge branch 'master' into postgres-query-builder 2018-08-14 12:51:03 +02:00
Marcus Efraimsson de25a4fe4e docs: update 2018-08-14 12:40:07 +02:00
Torkel Ödegaard a1ed3ae094 feat: add auto fit panels to shortcut modal, closes #12768 2018-08-14 12:26:08 +02:00
Marcus Efraimsson 3769df7119 changelog: add notes about closing #12680
[skip ci]
2018-08-14 12:16:46 +02:00
Marcus Efraimsson 74077be19e Merge pull request #12680 from svenklemm/timebucket
[postgres] add timescaledb option to postgres datasource
2018-08-14 12:12:43 +02:00
Marcus Efraimsson 6225efa50c docs: update postgres provisioning 2018-08-14 11:24:08 +02:00
Tobias Skarhed 86a2789541 Remove dependencies 2018-08-14 11:23:55 +02:00
Marcus Efraimsson ddc83c2a72 Merge pull request #12897 from dehrax/12224-renderer
WIP Karma to Jest: heatmap renderer (refactor)
2018-08-14 11:16:48 +02:00
Marcus Efraimsson 77ee032e41 Merge pull request #12809 from dehrax/12224-share-modal-ctrl
Karma to Jest: share_modal_ctrl
2018-08-14 10:57:15 +02:00
Tobias Skarhed a65589a5fb Rename test files 2018-08-14 10:52:41 +02:00
Marcus Efraimsson b70d594c10 changelog: add notes about closing #12598
[skip ci]
2018-08-14 10:35:34 +02:00
Sven Klemm a96d97e347 add version disclaimer for TimescaleDB 2018-08-14 10:26:08 +02:00
Marcus Efraimsson 03aed21d4b Merge pull request #12598 from kichristensen/TimeRangeVariables
Support timeFilter in query templating for InfluxDB
2018-08-14 10:24:21 +02:00
Sven Klemm d33019ca67 document TimescaleDB datasource option 2018-08-14 10:22:57 +02:00
Sven Klemm 837388d13e Use variable in newPostgresMacroEngine 2018-08-14 09:44:58 +02:00
Tobias Skarhed e696dc4d5f Remove Karma scripts and docs 2018-08-14 09:28:08 +02:00
Marcus Efraimsson 766d0bef17 changelog: add notes about closing #10705
[skip ci]
2018-08-14 09:19:37 +02:00
Torkel Ödegaard 4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +02:00
Marcus Efraimsson 8dbc75ceea Merge pull request #12844 from grafana/10705_dash_links
Use uid when linking to dashboards internally in a dashboard
2018-08-14 09:16:43 +02:00
Sven Klemm 3955133f7e Don't pass datasource to newPostgresMacroEngine 2018-08-14 09:15:24 +02:00
Tobias Skarhed 53bab1a84b Remove tests and logs 2018-08-14 09:15:14 +02:00
Torkel Ödegaard 0fa47c5ef4 Update CHANGELOG.md 2018-08-14 08:55:27 +02:00
Torkel Ödegaard 7e0482e78d Fix for Graphite function parameter quoting (#12907)
* fix: graphite function parameters should never be quoted for boolean, node, int and float types, fixes #11927

* Update gfunc.ts
2018-08-14 08:52:51 +02:00
Torkel Ödegaard e37931b79d Update CHANGELOG.md 2018-08-14 08:52:30 +02:00
Marcus Efraimsson 36e808834d don't render hidden columns in table panel (#12911) 2018-08-14 08:50:22 +02:00
Torkel Ödegaard 277a696fa5 fix: added missing ini default keys, fixes #12800 (#12912) 2018-08-14 08:49:56 +02:00
Sven Klemm 3552a4cb86 refactor timescaledb handling in MacroEngine 2018-08-14 08:47:33 +02:00
Torkel Ödegaard 2459b177f9 change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests 2018-08-13 18:09:01 +02:00
Tobias Skarhed fa6d25af72 Remove comment 2018-08-13 16:36:22 +02:00
Tobias Skarhed be7b663369 Cleanup 2018-08-13 16:36:22 +02:00
Tobias Skarhed 38422ce8a4 All tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed 35694a76ef Class to function. Half tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed 739bee0207 Karma to Jest: graph (refactor) (#12860)
* Begin conversion

* Test setup started

* Begin rewrite of graph

* Rewrite as class

* Some tests passing

* Fix binding errors

* Half tests passing

* Call buildFlotPairs. More tests passing

* All tests passing

* Remove test test

* Remove Karma test

* Make methods out of event functions

* Rename GraphElement
2018-08-13 16:08:01 +02:00
Torkel Ödegaard c521f51780 tech: removed js related stuff now that 99% is typescript (#12905) 2018-08-13 15:56:11 +02:00
Tobias Skarhed 472b880939 Add React container 2018-08-13 15:51:58 +02:00
Marcus Efraimsson 9031866caa changelog: add notes about closing #12805
[skip ci]
2018-08-13 15:51:19 +02:00
Marcus Efraimsson 4cebf38ff2 Merge pull request #12807 from nyxi/master
Support client certificates for LDAP servers
2018-08-13 15:48:39 +02:00
Marcus Efraimsson 39669e5002 fix redirect to panel when using an outdated dashboard slug (#12901) 2018-08-13 15:41:15 +02:00
David 1c185ef8d8 Add commit to external stylesheet url (#12902)
- currently only the release is used as a fingerprint which produces
  caching issues for all lastest master builds
- also add build commit to url fingerprint
- make bra also watch go html template files
2018-08-13 15:40:52 +02:00
Torkel Ödegaard b0f3ca16d9 Update CHANGELOG.md 2018-08-13 15:40:37 +02:00
Marcus Efraimsson b8a1385c77 build: increase frontend tests timeout without no output 2018-08-13 15:40:07 +02:00
Torkel Ödegaard f2b1fabd5c fix: Alerting rendering timeout was 30 seconds, same as alert rule eval timeout, this should be much lower so the rendering timeout does not timeout the rule context, fixes #12151 (#12903) 2018-08-13 15:38:28 +02:00
Marcus Efraimsson fd032c1111 changelog: add notes about closing #12476
[skip ci]
2018-08-13 15:18:33 +02:00
Marcus Efraimsson d110343e53 Merge pull request #12838 from grafana/12476-show-teams-on-profile
show teams on profile
2018-08-13 15:16:04 +02:00
Patrick O'Carroll 535bab1baa now hides team header when no teams + fix for list hidden when only one team 2018-08-13 15:07:29 +02:00
Tobias Skarhed e6057e08de Rename to HeatmapRenderer 2018-08-13 14:24:15 +02:00
Tobias Skarhed 2e2de38b31 Mock things 2018-08-13 13:55:47 +02:00
David Kaltschmidt 978e89657e Explore: Fix label filtering for rate queries
- exclude `]` from match expression for selector injection to ignore
  range vectors like `[10m]`
2018-08-13 12:53:12 +02:00
Sven Klemm 3f5d325e5b Merge branch 'master' into postgres-query-builder 2018-08-13 12:40:00 +02:00
Sven Klemm 8c4d59363e add $__unixEpochGroup to mssql datasource 2018-08-13 12:23:42 +02:00
Sven Klemm fbc67a1c64 add $__unixEpochGroup to mysql datasource 2018-08-13 12:17:05 +02:00
Sven Klemm bfe28ee061 Add $__unixEpochGroup macro to postgres datasource 2018-08-13 12:08:14 +02:00
Patrick O'Carroll bdd9af0864 changed const members to filteredMembers to trigger get filtered members, changed input value to team.search (#12885) 2018-08-13 11:34:16 +02:00
Sven Klemm c9bbdf244c get timecolumn datatype on timecolumn change 2018-08-13 11:29:35 +02:00
Marcus Efraimsson edb34a36a0 changelog: add notes about closing #12882
[skip ci]
2018-08-13 11:16:49 +02:00
Leonard Gram d7a0f5ee07 Removes link to deprecated docker image build 2018-08-13 11:14:24 +02:00
Tobias Skarhed a79c43420a Add mocks 2018-08-13 10:57:32 +02:00
Marcus Efraimsson c4a189ee52 Merge pull request #12880 from svenklemm/setupfillmode
Refactor setting fillmode
2018-08-13 10:47:35 +02:00
Sven Klemm 1dd8192d51 fix datatype query 2018-08-13 09:57:46 +02:00
Leonard Gram aeba01237d Changelog update 2018-08-13 09:20:17 +02:00
Leonard Gram 48713b76f3 docker: makes it possible to set a specific plugin url.
Originally from the grafana/grafana-docker repo, authored
by @ClementGautier.
2018-08-13 09:17:44 +02:00
Torkel Ödegaard 974359534f Update CHANGELOG.md 2018-08-13 07:54:49 +02:00
Julien Pivotto 48364f0111 Add support for $__range_s (#12883)
Fixes #12882

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-08-13 07:53:41 +02:00
Sven Klemm d81a23becf Refactor setting fillmode
This adds SetupFillmode to the tsdb package to be used by the sql
datasources.
2018-08-12 10:51:58 +02:00
Sven Klemm d8606ddfb0 Merge branch 'master' into postgres-query-builder 2018-08-12 10:02:18 +02:00
Ali Anwar 5fd8849d65 Update dashboard.md 2018-08-11 23:44:15 -07:00
Ali Anwar 8d2aac0936 Fix typo 2018-08-11 23:42:31 -07:00
David Kaltschmidt 87745e6e44 Explore: label selector for logging
- query all available label keys for logs
- query all values for each key
- build cascader options with label values by key
- lots of temporarily added conditions to reuse the promquery field
2018-08-10 16:41:21 +02:00
Tobias Skarhed 520aad819d Replace element 2018-08-10 16:30:51 +02:00
Tobias Skarhed 076bfea362 Rewrite heatmap to class 2018-08-10 15:35:47 +02:00
David Kaltschmidt 0f5945c557 Explore: still show rate hint if query is complex
- action hint currently only works for very simple queries
- show a hint w/o action otherwise
2018-08-10 15:29:21 +02:00
David Kaltschmidt a0fbe3c296 Explore: Filter out existing labels in label suggestions
- a valid selector returns all possible labels from the series API
- we only want to suggest the label keys that are not part of the
  selector yet
2018-08-10 14:45:09 +02:00
Daniel Lee 1f88bfd2bc Add note for #12843 2018-08-10 14:02:51 +02:00
Daniel Lee 2770a7bc0c Merge pull request #12843 from pgiraud/plugin_readme_links
Convert URL-like text to links in plugins readme
2018-08-10 14:01:05 +02:00
Daniel Lee c2b4bbcfc0 Merge pull request #12848 from waderobson/patch-1
Add example OR search_filter to docs
2018-08-10 13:47:31 +02:00
Daniel Lee 71630e4a7b Merge pull request #12856 from grafana/12855-team-members-delete-button
Delete button for team members page
2018-08-10 13:46:13 +02:00
David Kaltschmidt e832f91fb6 Fix initial state in split explore
- remove `edited` from query state to reset queries
- clear more properties in state
2018-08-10 13:37:15 +02:00
Patrick O'Carroll 277c735814 replaced with EmptyListCta 2018-08-10 11:31:35 +02:00
Tobias Skarhed 9188f7423c Begin conversion 2018-08-10 09:35:19 +02:00
Patrick O'Carroll 1d1370d11d changed messaging 2018-08-10 08:27:22 +02:00
Sven Klemm a4a33d80db mention time_bucket in timescaledb tooltip 2018-08-09 17:30:46 +02:00
Marcus Efraimsson 1bb3cf1c31 keep legend scroll position when series are toggled (#12845) 2018-08-09 16:04:56 +03:00
David b9f4666821 Merge pull request #12846 from grafana/davkal/explore-rules-expansion
Explore: expand recording rules for queries
2018-08-09 14:34:08 +02:00
Patrick O'Carroll f339b3502a replaced confirm delete modal with deleteButton component in teams members list 2018-08-09 12:56:55 +02:00
Patrick O'Carroll 584a9cd942 [wip]added empty list cta to team list, if statement toggles view for when the list is empty or not 2018-08-09 11:05:20 +02:00
David 1c63f7a61f Update NOTICE.md 2018-08-09 10:51:04 +02:00
David Kaltschmidt 9d66eeb10c Fix padding for metrics chooser in explore 2018-08-09 10:21:54 +02:00
Sven Klemm d2984f3b0f fix rebase error 2018-08-09 10:14:14 +02:00
Sven Klemm acd1acba2d revert passing ctrl to testDatasource 2018-08-09 10:05:35 +02:00
Sven Klemm c3aad10047 change timescaledb to checkbox instead of select 2018-08-09 10:05:35 +02:00
Sven Klemm b987aee7cf add timescaledb option to postgres datasource
This adds an option to the postgres datasource config for
timescaledb support. When set to auto it will check for
timescaledb when testing the datasource.

When this option is enabled the $__timeGroup macro will
use the time_bucket function from timescaledb to group
times by an interval.

This also passes the datasource edit control to testDatasource
to allow for setting additional settings, this might be useful
for other datasources aswell which have optional or version
dependant features which can be queried.
2018-08-09 10:05:35 +02:00
Leonard Gram d48f1f57f0 build: fixes png rendering in the docker based docker-image build. 2018-08-09 09:10:53 +02:00
Dan Cech 8d0a100b94 remove duplicated /tmp entry in .dockerignore 2018-08-09 09:10:53 +02:00
Dan Cech c025490518 move run script, update README 2018-08-09 09:10:53 +02:00
Dan Cech 96d6657b00 produce an image compatible with grafana-docker 2018-08-09 09:10:53 +02:00
Lorenz Brun c89f21ba29 More efficient builds and some fixes to the Go binaries 2018-08-09 09:10:53 +02:00
Lorenz Brun a5d1fb7e56 Simple Docker-based build option
This Dockerfile allows anyone with a recent version of Docker to quickly build a fully working Grafana container without any local build tooling. Pulling the sources from Git and calling `docker build .` is enough.
2018-08-09 09:10:53 +02:00
Wade Robson 62a25a4f28 Add example OR search_filter to docs 2018-08-08 09:13:28 -07:00
David Kaltschmidt 128a5d98e1 Explore: expand recording rules for queries
- load recording rules from prometheus
- map rule name to rule query
- query hint to detect recording rules in query
- click on hint fix expands rule name to query
2018-08-08 16:56:21 +02:00
David c1b9bbc2cf Explore: Query hints for prometheus (#12833)
* Explore: Query hints for prometheus

- time series are analyzed on response
- hints are shown per query
- some hints have fixes
- fix rendered as link after hint
- click on fix executes the fix action

* Added tests for determineQueryHints()

* Fix index for rate hints in explore
2018-08-08 17:50:30 +03:00
Pierre GIRAUD d7fb704e27 Convert URL-like text to links in plugins readme 2018-08-08 16:07:33 +02:00
Marcus Efraimsson e97251fe28 skip target _self to remove full page reload 2018-08-08 16:01:35 +02:00
Marcus Efraimsson 8dfe4a97ef use uid when linking to dashboards internally in a dashboard 2018-08-08 16:01:01 +02:00
Sven Klemm 13d0fa4b9a add previous fill mode to query builder 2018-08-08 12:23:41 +02:00
Sven Klemm 3b6454ab88 Merge branch 'master' into postgres-query-builder 2018-08-08 12:09:17 +02:00
Patrick O'Carroll a94406ac53 added more info about the teams 2018-08-08 11:22:47 +02:00
Patrick O'Carroll ca06893e69 removed mock-teams, now gets teams from backend 2018-08-08 10:50:27 +02:00
Marcus Efraimsson 817179c097 changelog: add notes about closing #12756
[skip ci]
2018-08-08 10:33:30 +02:00
Marcus Efraimsson 8952137ea2 Merge pull request #12753 from svenklemm/sql-fillmode-last
Add fill mode to fill in previously seen value when point is missing to SQL datasources
2018-08-08 10:29:56 +02:00
Marcus Efraimsson beddfdd86b add api route for retrieving teams of signed in user 2018-08-08 10:26:05 +02:00
Marcus Efraimsson 9938835dde devenv: update sql dashboards 2018-08-08 09:47:45 +02:00
Patrick O'Carroll b0ddc15e1a team list for profile page + mock teams 2018-08-08 09:23:36 +02:00
Marcus Efraimsson 89298d0cf5 Merge pull request #12815 from tariq1890/url_query_fix
Fixing bug in url query reader and added test cases
2018-08-08 09:18:32 +02:00
Marcus Efraimsson a6a29f0b20 changelog: add notes about closing #11270
[skip ci]
2018-08-08 09:13:44 +02:00
Marcus Efraimsson c67bec5487 Merge pull request #12834 from grafana/11270_secret_fields
Fix issue with secret fields after updating datasource
2018-08-08 09:11:07 +02:00
Marcus Efraimsson 77b561cf14 Merge pull request #12835 from bdeluca/patch-1
fix missing *
2018-08-08 09:02:58 +02:00
tariq1890 e8dfbe94b1 Fixing bug in url query reader and added test cases 2018-08-07 18:43:59 -07:00
Ben de Luca a156b6ee06 fix missing *
The missing * causes the text to be in the box to be displayed incorrectly.
2018-08-07 22:32:02 +02:00
Sven Klemm 52c7edf2f4 rename last fillmode to previous 2018-08-07 21:11:51 +02:00
Sven Klemm ee7602ec1f change fillmode from last to previous 2018-08-07 21:01:41 +02:00
David 91d04b87ad Merge pull request #12821 from grafana/davkal/explore-query-ux
Explore: prometheus query helpers
2018-08-07 17:56:08 +02:00
Marcus Efraimsson eb1b9405b2 return proper payload from api when updating datasource 2018-08-07 17:56:02 +02:00
David Kaltschmidt 2961c3b3b9 Review feedback
- use color variables for cascader styles
- fix Table value type
2018-08-07 17:42:00 +02:00
Marcus Efraimsson e9746db5ab changelog: update #12768
[skip ci]
2018-08-07 17:02:46 +02:00
Marcus Efraimsson cfe81510f9 Merge pull request #12796 from dehrax/12768-panel-heights
WIP: Fit panels to screen height
2018-08-07 15:57:40 +02:00
Tobias Skarhed 2ad358215a Remove window 2018-08-07 14:49:11 +02:00
Tobias Skarhed a0da66610e Fix url param errors 2018-08-07 14:48:22 +02:00
David Kaltschmidt 642374de25 Explore: Metrics chooser for prometheus
- load all histogrammable metrics on start, based on `{le!=''}` series
  query
- select dropdown shows all those metrics as well as histograms in a
  special group
- select a metric will write fill the metric in the query box
- if a histogram is chosen, it will write a complete
  `histogram_quantile` query
- added new dependency: rc-cascader
2018-08-07 13:43:32 +02:00
David Kaltschmidt 307248f713 Add clear row button
- clears the content of a query row
2018-08-07 13:43:32 +02:00
David Kaltschmidt 00f04f4ea0 Add clear button to Explore
- Clear All button to clear all queries and results
- moved result viewer buttons below query rows to make it more clear
  that they govern result options
2018-08-07 13:42:32 +02:00
David f43735ac25 Merge pull request #12813 from grafana/davkal/explore-empty-results
Explore: show message if queries did not return data
2018-08-07 13:40:32 +02:00
David Kaltschmidt f1c1633d15 Explore: show message if queries did not return data
- every result viewer displays a message that it received an empty data
  set
2018-08-07 13:03:33 +02:00
David 0f94d2f5f1 Fix closing parens completion for prometheus queries in Explore (#12810)
- position was determined by SPACE, but Prometheus selectors can
  contain spaces
- added negative lookahead to check if space is outside a selector
- moved braces plugin into PromQueryField since braces are prom specific
2018-08-07 13:34:12 +03:00
Torkel Ödegaard 4a387a9655 Update ROADMAP.md 2018-08-07 11:43:04 +02:00
Torkel Ödegaard 433b0abf6d Update ROADMAP.md 2018-08-07 11:36:17 +02:00
Torkel Ödegaard e115e600db Update ROADMAP.md 2018-08-07 11:35:05 +02:00
Benjamin Schweizer a653b277f3 switched to lowercase 2018-08-06 22:04:33 +02:00
Benjamin Schweizer 9220f83b3d replaced escape() call, renamed formatter to be more expressive 2018-08-06 21:54:12 +02:00
David 34761205fd Merge pull request #12799 from grafana/davkal/explore-history
Explore: Add history to query fields
2018-08-06 17:46:15 +02:00
Leonard Gram a73fc4a688 Smaller docker image (#12824)
* build: makes the grafana docker image smaller.

* build: branches and PR:s builds the docker image.
2018-08-06 17:34:25 +02:00
Marcus Efraimsson b3c25076d0 Merge pull request #12746 from grafana/11305_mssql_logo
Mssql: add logo
2018-08-06 17:19:53 +02:00
Marcus Efraimsson 8a1b620551 Merge pull request #12823 from dadosch/master
unix socket docs
2018-08-06 17:12:40 +02:00
Leonard Gram 0d9870d9f1 build: failing to push to docker hub fails the build. 2018-08-06 16:26:59 +02:00
David Kaltschmidt cda3b01781 Reversed history direction for explore
- _.reverse() was modifying state.history
2018-08-06 14:45:03 +02:00
David Kaltschmidt eaff7b0f68 Explore: Add history to query fields
- queries are saved to localstorage history array
- one history per datasource type (plugin ID)
- 100 items kept with timestamps
- history suggestions can be pulled up with Ctrl-SPACE
2018-08-06 14:45:03 +02:00
dadosch 4e33314c14 unix socket docs 2018-08-06 14:40:30 +02:00
Leonard Gram dc60828407 Merge pull request #12798 from grafana/grafana-docker
Merges the Grafana docker build into the main repository.
2018-08-06 14:39:51 +02:00
David 5da3584dd4 Explore: facetting for label completion (#12786)
* Explore: facetting for label completion

- unified metric and non-metric label completion
- label keys and values are now fetched fresh for each valid selector
- complete selector means only values are suggested that are supported
  by the selector
- properly implemented metric lookup for selectors (until the first
  metric was used which breaks when multiple metrics are present)
- typeahead tests now need a valid selection to demark the cursor

* Fix facetting queries for empty selector
2018-08-06 15:36:02 +03:00
Leonard Gram 3096905d39 docs: how to build a docker image. 2018-08-06 14:16:35 +02:00
Marcus Efraimsson e60d0c12f5 Merge pull request #12787 from dehrax/12224-variable-srv
Karma to Jest: variable_srv
2018-08-06 11:34:43 +02:00
Tobias Skarhed 9f87f6081a Remove Karma test 2018-08-06 11:23:50 +02:00
Tobias Skarhed 46dd4eba9e All tests passing 2018-08-06 11:23:50 +02:00
Tobias Skarhed 034ca69610 Add mock constructor 2018-08-06 11:23:50 +02:00
Tobias Skarhed 7f4723a9a7 Begin conversion 2018-08-06 11:23:50 +02:00
Marcus Efraimsson ca0339fb48 Merge pull request #12819 from dehrax/12224-opentsdb-ds
Karma to Jest: OpenTSDB datasource
2018-08-06 11:22:01 +02:00
Tobias Skarhed ccd964e1df Convert query control 2018-08-06 10:57:58 +02:00
Tobias Skarhed 45eadae692 Convert datasource 2018-08-06 10:42:35 +02:00
Torkel Ödegaard 624f3a0173 refactor: take submenu into account PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard b1b8a38061 refactor: renaming variables, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard 013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Tobias Skarhed f00b5eee83 Remove weird import 2018-08-05 11:39:46 +02:00
Tobias Skarhed 4b84a58575 Disable submenu when autopanels is enabled 2018-08-05 11:39:46 +02:00
Tobias Skarhed 36c406eefb Extract to own method 2018-08-05 11:39:46 +02:00
Tobias Skarhed 1618b095c7 Use and add keybard shortcut 2018-08-05 11:39:46 +02:00
Tobias Skarhed 63fa9fdc6d Add temporary url parameter 2018-08-05 11:39:46 +02:00
Tobias Skarhed 338a37abc8 Replace floor with round 2018-08-05 11:39:46 +02:00
Tobias Skarhed 9e4748e2aa Go with just single margin compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed 78b3dc40f1 Add margin and padding compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed a9f24bb36d Remove weird import 2018-08-05 11:39:45 +02:00
Tobias Skarhed 818fe09a7f Fit panels to screen height 2018-08-05 11:39:45 +02:00
Sven Klemm 6d07d825e9 dont break default parameters for functions 2018-08-03 18:38:40 +02:00
Sven Klemm e4ae8be9fa fix suggestion query 2018-08-03 14:09:41 +02:00
Marcus Efraimsson 6f1b125c48 Merge pull request #12808 from dehrax/12224-simple
Karma to Jest: remove tests
2018-08-03 13:38:57 +02:00
David Kaltschmidt c900a30106 renamed slate unit tests to .jest.ts 2018-08-03 13:09:05 +02:00
Tobias Skarhed 61eb96ed79 Remove simple tests 2018-08-03 12:34:13 +02:00
Emil Flink 5bea54eaaa Support client certificates for LDAP servers 2018-08-03 12:00:20 +02:00
Tobias Skarhed 61e3a0cceb Begin conversion 2018-08-03 11:57:03 +02:00
David bda49fcaa2 Add click on explore table cell to add filter to query (#12729)
* Add click on explore table cell to add filter to query

- move query state from query row to explore container to be able to set
  modified queries
- added TS interface for columns in table model
- plumbing from table cell click to datasource
- add modifyQuery to prometheus datasource
- implement addFilter as addLabelToQuery with tests

* Review feedback

- using airbnb style for Cell declaration
- fixed addLabelToQuery for complex label values
2018-08-03 11:20:13 +03:00
Sven Klemm aa830211fe dont order for aggregate 2018-08-03 10:15:28 +02:00
Leonard Gram 0ff54d257a build: makes it easier to build a local docker container. 2018-08-03 09:40:02 +02:00
Sven Klemm dabfd88cd9 add moving average to query builder 2018-08-03 07:44:36 +02:00
Sven Klemm 0b57e88f9e adjust frontend test 2018-08-03 06:19:53 +02:00
Sven Klemm 2cae966e6c use $__timeGroupAlias macro 2018-08-02 21:40:15 +02:00
Sven Klemm 5c25844cd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 21:11:16 +02:00
Sven Klemm 83d7ec1da2 specify grafana version for last fill mode 2018-08-02 20:37:41 +02:00
Sven Klemm bfc66a7ed0 add fillmode "last" to sql datasource
This adds a new fill mode last (last observation carried forward) for grafana
to the sql datasources. This fill mode will fill in the last seen value in a
series when a timepoint is missing or NULL if no value for that series has
been seen yet.
2018-08-02 20:35:09 +02:00
Leonard Gram b61ac546f1 build: disables external docker build for master and release. 2018-08-02 19:24:05 +02:00
Leonard Gram 99a9dbb04f build: complete docker build for master and releases. 2018-08-02 19:24:05 +02:00
Leonard Gram 424aa6e564 build: removes unused args to docker build. 2018-08-02 19:24:05 +02:00
Leonard Gram 580e2c36d1 build: imported latest changes from grafana-docker. 2018-08-02 19:24:05 +02:00
Leonard Gram e848930476 build: attach built resources. 2018-08-02 19:24:05 +02:00
Leonard Gram e3a907214d build: builds docker image from local grafna tgz. 2018-08-02 19:24:05 +02:00
Leonard Gram bfe41d3cf1 build: new workflow for PR:s and branches. 2018-08-02 19:24:05 +02:00
Leonard Gram 62d3655da4 docker: inital copy of the grafana-docker files. 2018-08-02 19:24:05 +02:00
Marcus Efraimsson 72af8a7044 changelog: add notes about closing #1823 #12801
[skip ci]
2018-08-02 18:57:13 +02:00
Marcus Efraimsson 116c4f2bff Merge pull request #12802 from gzzo/patch-1
Add auto_assign_org_id to defaults.ini
2018-08-02 18:49:43 +02:00
gzzo cb76fc7f2d Add auto_assign_org_id to defaults.ini
For #12801
2018-08-02 12:29:47 -04:00
Marcus Efraimsson 7f85dd055e changelog: add notes about closing #12749
[skip ci]
2018-08-02 16:44:29 +02:00
Sven Klemm 67edb9e9fe Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 16:39:27 +02:00
Marcus Efraimsson e5178b7d1d changelog: add notes about closing #12766
[skip ci]
2018-08-02 16:37:52 +02:00
Marcus Efraimsson 5cca478656 Merge pull request #12760 from svenklemm/postgres-timegroup
remove alias from postgres $__timeGroup macro

add $__timeGroupAlias macro to all sql datasources
2018-08-02 16:36:01 +02:00
Marcus Efraimsson 4d3e435298 Merge pull request #12774 from grafana/12766-table-colored-cell-link
table link color fix
2018-08-02 16:32:09 +02:00
Marcus Efraimsson 7f4f130a80 adjust test dashboards 2018-08-02 16:21:49 +02:00
Marcus Efraimsson 4962bf9d44 remove info logging 2018-08-02 15:49:50 +02:00
Patrick O'Carroll ff0ca6b7e2 added two new classes for color, fixed so link has value color 2018-08-02 15:25:48 +02:00
Marcus Efraimsson 76f131aa80 changelog: add notes about closing #12063
[skip ci]
2018-08-02 15:09:23 +02:00
Marcus Efraimsson c074c842e6 Merge pull request #12063 from A21z/patch-1
Add new Redshift metrics and dimensions for Cloudwatch datasource
2018-08-02 15:05:24 +02:00
Alban Perillat-Merceroz f3d400f1a7 Add new Redshift metrics and dimensions for Cloudwatch datasource
AWS/Redshift has new dimensions (`latency`, `service class`, `wmlid`) and metrics (`QueriesCompletedPerSecond`, `QueryRuntimeBreakdown`, `QueryDuration`,  `WLMQueriesCompletedPerSecond`, `WLMQueryDuration`, `WLMQueueLength`) in Cloudwatch: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/rs-metricscollected.html
2018-08-02 14:45:24 +02:00
Marcus Efraimsson ae0d7a3a5d changelog: add notes about closing #12752
[skip ci]
2018-08-02 12:54:33 +02:00
Marcus Efraimsson de1a0e4789 changelog: update
[skip ci]
2018-08-02 12:51:23 +02:00
andig 57910549b6 Improve iOS and Windows 10 experience (#12769)
* Improve iOS homescreen icon

* Improve Windows10 tile experience

* Remove unused favicon
2018-08-02 03:37:50 -07:00
Torkel Ödegaard 169fcba520 Update CHANGELOG.md 2018-08-02 11:51:41 +02:00
Mitsuhiro Tanda 04fcd2a054 add series override option to hide tooltip (#12378)
* add series override option to hide tooltip

* fix test

* invert option

* fix test

* remove initialization
2018-08-02 02:49:40 -07:00
Marcus Efraimsson a8976f6c36 changelog: add notes about closing #12785
[skip ci]
2018-08-02 11:43:48 +02:00
Marcus Efraimsson 9fa779315e Merge pull request #12791 from eMerzh/fix_quote
fix custom variable quoting in sql* query interpolations
2018-08-02 11:37:46 +02:00
Patrick O'Carroll b03e3242e3 removed table-panel-link class 2018-08-02 11:21:17 +02:00
Patrick O'Carroll 36d981597e removed table-panel-link class and add a class white to modify table-panel-cell-link class 2018-08-02 11:18:21 +02:00
Sven Klemm 7e9c9199c1 add warning when switching from raw sql mode 2018-08-02 10:15:53 +02:00
Sven Klemm a221d9ec84 add more prominent button for switching edit mode 2018-08-02 09:50:21 +02:00
Sven Klemm 5c3b80b492 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-08-02 09:17:21 +02:00
ryan 27e96179c1 Merge remote-tracking branch 'grafana/master'
* grafana/master: (104 commits)
  Change to arrow functions
  Add all tests to one file
  changelog: add notes about closing #12561
  Remove angularMocks
  All tests passing
  changelog: add notes about closing #12762
  fix: team email tooltip was not showing
  fix: test data api route used old name for test data datasource, fixes #12773
  changelog: add notes about closing #12300
  Weird execution order for the tests...
  changelog: add notes about closing #12744
  changelog: add notes about closing #12727
  add aws_dx to cloudwatch datasource
  also fixed "Watt per square metre"
  fixed that missing one
  add version note to metric prefix and fix typo
  devenv: update sql dashboards
  mssql: update tests
  fix usage of metric column types so that you don't need to specify metric alias
  Begin conversion
  ...
2018-08-01 21:07:36 -07:00
Sven Klemm 82c473e3af document $__timeGroupAlias 2018-08-01 21:23:00 +02:00
Sven Klemm b71d10a7a4 add $__timeGroupAlias to mysql and mssql 2018-08-01 20:58:51 +02:00
Brice Maron bb7e583863 fix custom variable quoting in sql* query interpolations 2018-08-01 20:32:50 +02:00
Marcus Efraimsson 9d3743774d Merge pull request #12771 from dehrax/12224-prometheus-ds
Karma to Jest: prometheus datasource
2018-08-01 15:06:36 +02:00
Sven Klemm dc22e24642 add compatibility code to handle pre 5.3 usage 2018-08-01 15:06:18 +02:00
Tobias Skarhed 951b623bd2 Change to arrow functions 2018-08-01 14:27:45 +02:00
Tobias Skarhed af32bfebef Add all tests to one file 2018-08-01 14:26:29 +02:00
Marcus Efraimsson 8d0c4cdc09 changelog: add notes about closing #12561
[skip ci]
2018-08-01 12:30:50 +02:00
Marcus Efraimsson 951679d50b Merge pull request #12561 from activeshadow/aws-rds-burst-balance
Added BurstBalance metric to list of AWS RDS metrics.
2018-08-01 12:28:15 +02:00
Tobias Skarhed 790aadf8ef Remove angularMocks 2018-08-01 10:09:05 +02:00
Tobias Skarhed d6158bc293 All tests passing 2018-08-01 09:30:26 +02:00
Patrick O'Carroll d4d896ade8 replaced style with class for links 2018-08-01 09:08:17 +02:00
Sven Klemm 42f1892826 Add $__timeGroupAlias to postgres macros 2018-08-01 09:03:34 +02:00
Sven Klemm bd77541e09 adjust test dashboards 2018-08-01 08:52:11 +02:00
Sven Klemm 43295f9c18 remove alias from postgres $__timeGroup macro 2018-08-01 08:50:19 +02:00
Marcus Efraimsson 6df3722a35 changelog: add notes about closing #12762
[skip ci]
2018-07-31 18:01:36 +02:00
Marcus Efraimsson dfda51a9be Merge pull request #12762 from sohonet/add_cloudwatch_aws_dx
add AWS/DX metrics and dimension to cloudwatch
2018-07-31 17:58:32 +02:00
Torkel Ödegaard 89eae1566d fix: team email tooltip was not showing 2018-07-31 17:31:45 +02:00
Torkel Ödegaard 276a5e6eb5 fix: test data api route used old name for test data datasource, fixes #12773 2018-07-31 17:29:02 +02:00
Patrick O'Carroll 4b8ec4e323 removed a blank space in div 2018-07-31 13:07:43 +02:00
Sven Klemm b8af68e05a Merge branch 'master' into postgres-query-builder 2018-07-31 13:04:27 +02:00
Patrick O'Carroll 7b5b94607b fixed color for links in colored cells by adding a new variable that sets color: white when cell or row has background-color 2018-07-31 12:51:07 +02:00
Marcus Efraimsson f1f0400769 changelog: add notes about closing #12300
[skip ci]
2018-07-31 11:41:58 +02:00
Marcus Efraimsson 3cecc0b54e Merge pull request #12301 from franciscocpg/cloudwatch-app-sync
Adding Cloudwatch AWS/AppSync metrics and dimensions
2018-07-31 11:38:31 +02:00
Tobias Skarhed e4c2476f3c Weird execution order for the tests... 2018-07-31 09:35:08 +02:00
Benjamin Schweizer 7da9c33ae4 fixed test result 2018-07-30 17:28:50 +02:00
Benjamin Schweizer a2967565de added urlescape formatting option 2018-07-30 17:19:41 +02:00
Marcus Efraimsson ad84a145f5 changelog: add notes about closing #12744
[skip ci]
2018-07-30 17:03:24 +02:00
Marcus Efraimsson 162d3e8036 changelog: add notes about closing #12727
[skip ci]
2018-07-30 17:03:01 +02:00
Marcus Efraimsson 49430f7557 Merge pull request #12744 from Worty/master
change units to include characters for power of 2 and 3
2018-07-30 16:59:12 +02:00
Jason Pereira 88d8072be3 add aws_dx to cloudwatch datasource 2018-07-30 15:51:15 +01:00
Worty 4fa979649c also fixed "Watt per square metre" 2018-07-30 16:28:19 +02:00
Worty 9c0fbe5a0b fixed that missing one 2018-07-30 16:19:31 +02:00
Sven Klemm 6613f11499 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-30 15:23:56 +02:00
Marcus Efraimsson e648ed197f Merge pull request #12679 from svenklemm/postgres-metric-prefix
Use metric column as prefix when returning multiple value columns
2018-07-30 14:50:11 +02:00
Sven Klemm 8a22129177 add version note to metric prefix and fix typo 2018-07-30 14:37:23 +02:00
Marcus Efraimsson 917b6b11b0 devenv: update sql dashboards 2018-07-30 13:54:57 +02:00
Marcus Efraimsson 38a52c2489 mssql: update tests 2018-07-30 13:50:52 +02:00
Marcus Efraimsson e32cf75c2d fix usage of metric column types so that you don't need to specify metric alias 2018-07-30 13:50:18 +02:00
Tobias Skarhed 3d4a346c66 Begin conversion 2018-07-30 13:02:08 +02:00
Marcus Efraimsson e4983cba2f changelog: update
[skip ci]
2018-07-30 10:21:22 +02:00
Marcus Efraimsson 13a7b638bc changelog: add notes about closing #12747
[skip ci]
2018-07-30 10:19:51 +02:00
Jan Garaj e37e8cb38c Add missing tls_skip_verify_insecure (#12748) 2018-07-30 00:02:16 -07:00
Sven Klemm ace999b13f rename special to windows 2018-07-29 15:56:22 +02:00
Sven Klemm 26ea88252b add first and last support 2018-07-29 15:00:13 +02:00
Sven Klemm d7ddab958e Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-29 13:41:41 +02:00
Sven Klemm 412bb6acab refactor function handling in query builder 2018-07-29 13:31:50 +02:00
Sven Klemm 5327580939 refactor column function handling 2018-07-28 21:41:23 +02:00
Sven Klemm 6ca7a03975 consistent nameing fro group and select 2018-07-28 12:53:36 +02:00
Marcus Efraimsson 20b2b344f6 mssql: add logo 2018-07-28 11:31:30 +02:00
Sven Klemm 3aa4790979 add tests for metric column prefix to mssql 2018-07-27 18:13:19 +02:00
Sven Klemm e487fabcd5 add metric column prefix test for mysql 2018-07-27 17:59:59 +02:00
Sven Klemm 036647ae35 document metric column prefix in query editor 2018-07-27 17:18:45 +02:00
Marcus Efraimsson 8188679951 Merge pull request #12745 from dehrax/12224-heatmap-ctrl
Karma to Jest: heatmap_ctrl
2018-07-27 17:18:15 +02:00
Marcus Efraimsson 710566e146 Merge pull request #12742 from dehrax/12224-backend-srv
Karma to Jest: backend_srv
2018-07-27 17:17:54 +02:00
Marcus Efraimsson 86d75a64c1 Merge pull request #12737 from dehrax/12224-singlestat
Karma to Jest: singlestat
2018-07-27 17:17:09 +02:00
Sven Klemm bc9b6ddefe document metric column prefix for mysql and mssql 2018-07-27 17:14:27 +02:00
Tobias Skarhed 805dc3542f Remove extra mock 2018-07-27 16:46:41 +02:00
Tobias Skarhed 26f709e87e Karm to Jest 2018-07-27 16:45:03 +02:00
Worty 895b4b40ee correct volume unit 2018-07-27 16:26:04 +02:00
Tobias Skarhed c11d0f5cc6 Remove lo 2018-07-27 15:52:22 +02:00
Tobias Skarhed 2f6b302375 Test passing. Remove Karma 2018-07-27 15:51:56 +02:00
Sven Klemm 7905c29875 adjust metric prefix code to sql engine refactor 2018-07-27 15:34:04 +02:00
Sven Klemm f9d6c88a55 add testcase for metric column as prefix 2018-07-27 15:32:54 +02:00
Sven Klemm b28a362635 Use metric column as prefix
If multiple value columns are returned and a metric column is
returned aswell the metric column will be used as prefix for
the series name
2018-07-27 15:32:53 +02:00
Tobias Skarhed 766c23a1eb Fix emit errors 2018-07-27 15:16:19 +02:00
Tobias Skarhed 2db4a54f75 Fix test 2018-07-27 14:40:56 +02:00
Tobias Skarhed 4e6168f3a3 Add async/await 2018-07-27 14:22:48 +02:00
Marcus Efraimsson 715c82b67b Merge pull request #12740 from grafana/unused-class-from-deletebutton
removed unused class from the deletebutton pr
2018-07-27 14:13:41 +02:00
Marcus Efraimsson 02ba467bf1 Merge pull request #12730 from marefr/sql_refactor
SQL datasources - backend refactor
2018-07-27 14:13:19 +02:00
Sven Klemm ad26a319c5 refactor schema query generation 2018-07-27 14:02:12 +02:00
Patrick O'Carroll 971e52ecc9 removed unused class from the deletebutton pr 2018-07-27 13:48:14 +02:00
Patrick O'Carroll 1bb5a57036 frontend part with mock-team-list 2018-07-27 13:45:16 +02:00
Tobias Skarhed 55111c801f Update test for local time 2018-07-27 13:41:07 +02:00
Marcus Efraimsson b4ac3f2379 update devenv datasources and dashboards for sql datasources 2018-07-27 13:33:50 +02:00
Tobias Skarhed 67c613a45a Begin conversion 2018-07-27 13:29:57 +02:00
Marcus Efraimsson e43feb7bfa use const for rowlimit in sql engine 2018-07-27 13:21:40 +02:00
Marcus Efraimsson 0550ec6de1 Merge pull request #12665 from grafana/9863-animated-delete-button
built a component for delete button in tables
2018-07-27 12:37:53 +02:00
Sven Klemm 734118de86 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-27 11:52:38 +02:00
Tobias Skarhed bff7a29356 Cleanup 2018-07-27 11:34:14 +02:00
Tobias Skarhed 3d21e42aac Remove Karma file 2018-07-27 11:30:37 +02:00
Tobias Skarhed 47da3e3ae8 All tests passing 2018-07-27 11:28:16 +02:00
Tobias Skarhed 675a031b6c All except one passing 2018-07-27 11:04:01 +02:00
Sven Klemm 97f24733f5 remove tableschema from query builder ui 2018-07-27 10:58:08 +02:00
Marcus Efraimsson 48e5e65c73 changelog: add notes about closing #12731
[skip ci]
2018-07-27 10:33:06 +02:00
Marcus Efraimsson 13fa3a8378 Merge pull request #12734 from grafana/12731_fix_index_pattern
elasticsearch: fix index patterns
2018-07-27 10:22:02 +02:00
Marcus Efraimsson ab8fa0de74 elasticsearch: support reversed index patterns
Now both [index-]pattern and pattern[-index] are supported
2018-07-26 21:39:02 +02:00
Marcus Efraimsson 318b8c5a23 update devenv datasources and dashboards for sql datasources
Removed dashboards from docker blocks
2018-07-26 18:12:00 +02:00
Marcus Efraimsson 4f7882cda2 mssql: use new sql engine 2018-07-26 18:11:10 +02:00
Marcus Efraimsson 27db454012 mysql: use new sql engine 2018-07-26 18:10:45 +02:00
Marcus Efraimsson 2f3851b915 postgres: use new sql engine 2018-07-26 18:10:17 +02:00
Marcus Efraimsson d42cea5d42 refactor sql engine to make it hold all common code for sql datasources 2018-07-26 18:09:42 +02:00
Tobias Skarhed fc06f8bfe7 Pass more tests 2018-07-26 17:22:15 +02:00
David 7699451d94 Refactor Explore query field (#12643)
* Refactor Explore query field

- extract typeahead field that only contains logic for the typeahead
  mechanics
- renamed QueryField to PromQueryField, a wrapper around TypeaheadField
  that deals with Prometheus-specific concepts
- PromQueryField creates a promql typeahead by providing the handlers
  for producing suggestions, and for applying suggestions
- The `refresher` promise is needed to trigger a render once an async
  action in the wrapper returns.

This is prep work for a composable query field to be used by Explore, as
well as editors in datasource plugins.

* Added typeahead handling tests

- extracted context-to-suggestion logic to make it testable
- kept DOM-dependent parts in main onTypeahead funtion

* simplified error handling in explore query field

* Refactor query suggestions

- use monaco's suggestion types (roughly), see
  https://github.com/Microsoft/monaco-editor/blob/f6fb545/monaco.d.ts#L4208
- suggest functions and metrics in empty field (ctrl+space)
- copy and expand prometheus function docs from prometheus datasource
  (will be migrated back to the datasource in the future)

* Added prop and state types, removed unused cwrp

* Split up suggestion processing for code readability
2018-07-26 15:04:12 +03:00
Tobias Skarhed 88e91b3f51 Begin conversion 2018-07-26 10:44:40 +02:00
David 1db2e869c5 Merge pull request #12718 from grafana/davkal/ts-options
Add tslib to TS compiler
2018-07-26 10:41:14 +02:00
Marcus Efraimsson 751f68ab47 Merge pull request #12723 from dehrax/12224-variable-srv
Karma to Jest: variable_srv_init
2018-07-26 10:32:14 +02:00
Tobias Skarhed 35cc85bfcc All tests passing. Remove Karma test. 2018-07-26 09:36:46 +02:00
Tobias Skarhed 931b944cdd Almost all tests passing 2018-07-25 17:38:45 +02:00
David Kaltschmidt 84e431d377 Add tslib to TS compiler
- using tslib reduces bundle sizes
- add compiler option for easier default imports of CJS modules
- remove double entry of fork-ts-checker-plugin
- speed up hot reload by using exprimental ts-loader API
2018-07-25 17:06:44 +02:00
Marcus Efraimsson 48d9b37559 Merge pull request #12693 from dehrax/docs-prom-queryvars
Docs: Prometheus template query variables
2018-07-25 16:32:08 +02:00
Marcus Efraimsson 0f99e624b6 docs: using interval and range variables in prometheus
Included example usages
2018-07-25 16:20:00 +02:00
Tobias Skarhed 7d51c15240 Two passing tests 2018-07-25 16:15:03 +02:00
Josh Dadak c4308fedea Update Configuration.md
Perhaps not worded as best it could be, however it would be good to include some information here about the importance of having your Grafana SERVER_ROOT_URL being the same URL listed in your Return URLs in Azure Application.  Otherwise Azure Active Directory Auth will not work correctly resulting in an error page being displayed.
2018-07-25 14:02:36 +01:00
Tobias Skarhed f350461206 Start conversion 2018-07-25 14:52:03 +02:00
Marcus Efraimsson 7e773e2d5e changelog: add notes about closing #12533
[skip ci]
2018-07-25 14:14:25 +02:00
Marcus Efraimsson 9c40028d58 changelog: add notes about closing #12668
[skip ci]
2018-07-25 13:22:55 +02:00
Marcus Efraimsson 45762d04e3 changelog: update
[skip ci]
2018-07-25 11:55:34 +02:00
Marcus Efraimsson 5fbd8ada3c changelog: add notes about closing #12668
[skip ci]
2018-07-25 11:54:51 +02:00
Marcus Efraimsson 81a041b50c Merge pull request #12672 from grafana/12668-blue-in-light-theme
adjust table header contrast for the light theme
2018-07-25 11:49:45 +02:00
Patrick O'Carroll df62282c11 fix for typeahead background, increased lighten 2018-07-25 11:27:43 +02:00
Patrick O'Carroll f4ab432542 added position absolute and some flexbox so I could remov changes in display and setTimeout, added tests and types, did some renaming 2018-07-25 10:29:55 +02:00
Marcus Efraimsson 35920838aa Merge pull request #12709 from mtanda/cw_404_err_fix
fix invalid reference
2018-07-25 09:13:52 +02:00
Mitsuhiro Tanda 055d208a32 fix invalid reference 2018-07-25 11:27:43 +09:00
Marcus Efraimsson 582652145f minor fixes 2018-07-24 19:21:23 +02:00
Marcus Efraimsson 01ba973c86 Merge pull request #12707 from grafana/fix_failing_test
fix failing test due to time diff issues
2018-07-24 19:18:06 +02:00
Marcus Efraimsson 1dd9646a50 fix failing test due to time diff issues 2018-07-24 19:05:09 +02:00
Marcus Efraimsson 27b386c91d Merge pull request #12706 from dehrax/12224-graphite-query-ctrl
Karma to Jest: graphite query_ctrl
2018-07-24 19:02:50 +02:00
Tobias Skarhed ce9b25a5ac Remove comments 2018-07-24 18:30:29 +02:00
Marcus Efraimsson d8d748d2aa remove unneeded comment 2018-07-24 17:40:00 +02:00
Marcus Efraimsson 74b4d2efd5 Merge pull request #12704 from dehrax/12224-completer
Karma to Jest: completer
2018-07-24 17:37:43 +02:00
Tobias Skarhed 27c081349f Remove old influx stuff 2018-07-24 17:03:58 +02:00
Marcus Efraimsson 1c4dd6f2f7 Merge pull request #12702 from dehrax/12224-influx-query-ctrl
Karma to Jest: influx query_ctrl
2018-07-24 16:58:01 +02:00
Marcus Efraimsson 04c91601a4 Merge pull request #12699 from grafana/docs-reloading-configs
docs: mentation that config changes requires restart.
2018-07-24 16:47:18 +02:00
Marcus Efraimsson 5de8b6c2f0 changelog: add notes about closing #12489
[skip ci]
2018-07-24 16:45:36 +02:00
Marcus Efraimsson e921f3b673 Merge pull request #12698 from mtanda/cw_400_err
CloudWatch backend return 400 if user input error
2018-07-24 16:43:22 +02:00
Marcus Efraimsson a63fca03b8 changelog: add notes about closing #12551
[skip ci]
2018-07-24 15:57:07 +02:00
Marcus Efraimsson 1c691ac855 changelog: add notes about closing #12533
[skip ci]
2018-07-24 15:51:34 +02:00
Tobias Skarhed b58a7642dc Karma to Jest 2018-07-24 15:41:58 +02:00
Tobias Skarhed 25c8233523 Begin conversion 2018-07-24 15:41:58 +02:00
Marcus Efraimsson 3dab4e1b52 changelog: add notes about closing #12589
[skip ci]
2018-07-24 15:27:13 +02:00
Marcus Efraimsson b81621b6f5 changelog: add notes about closing #12636 #9827
[skip ci]
2018-07-24 15:24:44 +02:00
Tobias Skarhed 51caf470f5 Remove influx qeury_ctrl jest, as it is already completed 2018-07-24 14:56:14 +02:00
Tobias Skarhed d6381bed7c Test fail depending on test order 2018-07-24 14:56:13 +02:00
Tobias Skarhed d2f81d52d4 Karma to Jest: begin influx query_ctrl 2018-07-24 14:56:13 +02:00
Tobias Skarhed 49a8c2e0c1 Make beautiful 2018-07-24 14:56:13 +02:00
Tobias Skarhed c0f9c06f21 Karma to Jest: completer 2018-07-24 14:56:13 +02:00
Tobias Skarhed 48ae9ec77e Remove comments and Karm test 2018-07-24 14:35:37 +02:00
Tobias Skarhed 987a16086b Karma to Jest 2018-07-24 14:34:37 +02:00
Tobias Skarhed 81c32780b9 Pass more tests 2018-07-24 11:27:53 +02:00
Marcus Efraimsson 35efb7c225 changelog: add notes about closing #12644
[skip ci]
2018-07-24 11:26:09 +02:00
Marcus Efraimsson 05da21c6d7 Merge pull request #12678 from yogyrahmawan/escape_postgres_parameters
postgres; escape ssl mode parameter
2018-07-24 11:15:21 +02:00
Marcus Efraimsson 93e73919e8 fix code style 2018-07-24 11:03:46 +02:00
Leonard Gram 59c1705399 docs: mentation that config changes requires restart. 2018-07-24 10:34:11 +02:00
Mitsuhiro Tanda d9bf894383 return 400 if user input error 2018-07-24 17:06:55 +09:00
ryan 56927e55b6 Merge remote-tracking branch 'grafana/master'
* grafana/master: (51 commits)
  changing callback fn into arrow functions for correct usage of this (#12673)
  Fix requested changes
  Update CHANGELOG.md
  Add support for interval in query variable
  Change to arrow functions
  Add graph_ctrl jest
  changelog: add notes about closing #12691
  Update kbn.ts
  Add jest test file
  Id validation of CloudWatch GetMetricData
  changelog: adds note for #11487
  Datasource for Grafana logging platform
  fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642)
  added: replaces added to grafana
  fix: datasource search was not working properly
  docs: minor docs fix
  Fix label suggestions in Explore query field
  pluginloader: expose flot gauge plugin
  alert: add missing test after refactor
  Handle query string in storage public_url (#9351) (#12555)
  ...
2018-07-23 14:31:33 -07:00
David 4d722b2177 Merge pull request #12675 from grafana/davkal/logging-datasource
Datasource for Grafana logging platform
2018-07-23 18:11:11 +02:00
srid12 6b071054a3 changing callback fn into arrow functions for correct usage of this (#12673) 2018-07-23 07:23:26 -07:00
Marcus Efraimsson a17a9218da Merge pull request #12692 from dehrax/12224-graph-ctrl
Karma to Jest: graph_ctrl
2018-07-23 15:53:41 +02:00
Tobias Skarhed 47bec0fd91 Fix requested changes 2018-07-23 15:42:47 +02:00
Tobias Skarhed 70575c8f78 Add templating docs for 2018-07-23 15:34:03 +02:00
Tobias Skarhed 816ee82d26 Add docs about global variables in query template variables 2018-07-23 15:25:59 +02:00
David 76bc02b3fa Update CHANGELOG.md
Added #12597
2018-07-23 14:58:11 +02:00
Tobias Skarhed bb0af52d34 Figuring out why it doesn't initialize 2018-07-23 14:54:58 +02:00
David b09a7c5dd6 Merge pull request #12597 from dehrax/7664-query-var
Interval and range in query template variable
2018-07-23 14:48:49 +02:00
Tobias Skarhed 6b6a23ff6a Add support for interval in query variable
Add range to scopedVars

Add basic tests and extract function for range vars

Add support for range query variable in createQuery

Template vars squash
2018-07-23 14:33:21 +02:00
Tobias Skarhed 46e31621b0 Add jest file 2018-07-23 14:28:17 +02:00
Tobias Skarhed 529883b61d Change to arrow functions 2018-07-23 13:39:32 +02:00
Tobias Skarhed ed8568f0df Add graph_ctrl jest 2018-07-23 13:38:16 +02:00
Marcus Efraimsson 0fa98a812b changelog: add notes about closing #12691
[skip ci]
2018-07-23 13:13:18 +02:00
Marcus Efraimsson c26b9a49ad Merge pull request #12691 from mwegrzynek/add-pln-format
Add Polish złoty to currency formatters
2018-07-23 13:10:12 +02:00
Michał Węgrzynek ee2eda615e Update kbn.ts 2018-07-23 12:07:54 +02:00
Marcus Efraimsson d7401a9f8a Merge pull request #12690 from mtanda/cw_get_metricdata_input_validation
Id validation of CloudWatch GetMetricData
2018-07-23 11:48:01 +02:00
Tobias Skarhed ae935bf08b Add jest test file 2018-07-23 11:31:04 +02:00
Marcus Efraimsson dde484be60 Merge pull request #11469 from grafana/jquery-flot-events-to-ts
migrated jquery.flot.events to ts
2018-07-23 11:20:50 +02:00
Marcus Efraimsson 608303f4ce Merge branch 'master' into jquery-flot-events-to-ts 2018-07-23 10:59:25 +02:00
Mitsuhiro Tanda fb4546b811 Id validation of CloudWatch GetMetricData 2018-07-23 17:58:54 +09:00
Kim Christensen 8c52e2cd57 Fix timezone issues in test 2018-07-23 10:05:46 +02:00
Sven Klemm b3ebc86093 fix window function query without group by 2018-07-23 07:52:42 +02:00
Daniel Lee 34a8864601 changelog: adds note for #11487 2018-07-22 21:52:26 +02:00
Daniel Lee 5129ea8f87 Merge pull request #11624 from mtanda/cw_get_metric_data
CloudWatch GetMetricData support
2018-07-22 21:34:07 +02:00
Sven Klemm e1a37cf275 add order by to metadata queries 2018-07-22 17:12:30 +02:00
Sven Klemm 7af9cd7dfc set explicit order for rate and increase 2018-07-22 15:20:40 +02:00
yogyrahmawan 26aa575cb4 escaping ssl mode on postgres param 2018-07-22 08:04:57 +07:00
Sven Klemm 84d7743939 fix pre gui queries shortcircuit 2018-07-21 10:38:34 +02:00
Kim Christensen dd81f4381d Add unit test for InfluxDB datasource 2018-07-21 02:13:41 +02:00
Kim Christensen a2574ac068 Support timeFilter in templating for InfluxDB
After support for queries in template variables was added to InfluxDB,
it can be necessary to added dymanic time constraints. This can now be
done changing the variable refresh to "On Time Range Changed" for
InfluxDB
2018-07-21 00:45:02 +02:00
David Kaltschmidt 3297ae462d Datasource for Grafana logging platform
- new builtin datasource plugin "Logging" (likely going to be renamed)
- plugin implements no panel ctrls yet, only ships datasource
- new models for logging data as first class citizen (aside from table
  and time_series model)
- Logs as new view for Explore
- JSON view for development

Testable only against existing logish deployment.
Then test with queries like `{job="..."} regexp`.
2018-07-20 17:07:17 +02:00
Patrick O'Carroll b6909eb3b0 removed blue-dark variable with blue-light in light-theme, blue variable now has same value as blue-dark had before, should fix issue with any low contrast issues with blue in light-theme, this made query-blue variable unnecessery removed it, added variable for variable dropdown highlight background 2018-07-20 16:02:41 +02:00
Patrick O'Carroll b8a4b7771a removed import appEvents 2018-07-20 11:09:24 +02:00
Patrick O'Carroll 0b421004ea built a component for delete button in tables, instead of using a modal to confirm it now does it in the row of the table, created a sass file for the component, the component uses css transitions for animation 2018-07-20 09:59:04 +02:00
David bfd05ba6ec Merge pull request #12617 from grafana/davkal/prometheus-value-formatting
Make prometheus value formatting more robust
2018-07-18 17:11:16 +02:00
Torkel Ödegaard e413f026b9 fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642) 2018-07-18 07:21:32 -07:00
Torkel Ödegaard ce64a3ccbc added: replaces added to grafana 2018-07-18 15:40:30 +02:00
Torkel Ödegaard a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +02:00
Sven Klemm 9f0b4e0aa7 add groupby when adding first aggregate 2018-07-18 13:29:47 +02:00
Torkel Ödegaard 29291f88b1 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:20:56 +02:00
Torkel Ödegaard 913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
David Kaltschmidt 3ab5ab3674 Fix label suggestions in Explore query field
- In 0425b477 the labels suggestions were refactored and a typo broke
  the look up for available lables of a metric
2018-07-18 13:20:18 +02:00
Torkel Ödegaard 3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Torkel Ödegaard c63f142578 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:02:27 +02:00
Torkel Ödegaard 660dc09fa9 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 12:46:42 +02:00
Daniel Lee 3cb95fb40a pluginloader: expose flot gauge plugin 2018-07-18 12:05:45 +02:00
Daniel Lee f5cc7618c5 alert: add missing test after refactor 2018-07-17 22:17:43 +02:00
Jakob van Santen 92d417f6b4 Handle query string in storage public_url (#9351) (#12555) 2018-07-17 11:10:12 -07:00
David 21e5d61de6 Merge pull request #12631 from grafana/davkal/explore-url-encoding
Use url params for explore state
2018-07-17 16:49:13 +02:00
David 5c6adbbada Merge pull request #12630 from grafana/davkal/explore-empty-error
Dont parse empty explore state from url
2018-07-17 16:48:23 +02:00
Augustin 05e060dee0 HTTP API documentation +fix when updating a playlist (#12612)
* get id from path param when updating a playlist

* add playlist http api documentation

* remove required condition for the id in update cmd
2018-07-17 07:45:38 -07:00
David b526150578 Merge pull request #12634 from grafana/davkal/explore-step
Explore: calculate query interval based on available width
2018-07-17 16:36:51 +02:00
David Kaltschmidt 02427ef88d Explore: calculate query interval based on available width
- classic dashboard panels inject a dynamic query interval as part of
  the query options. Explore did not have that.
- this PR adds the interval calculation to Explore
- interval based on Explore container's width
- ensure min interval if set in datasource
2018-07-17 15:13:44 +02:00
David Kaltschmidt c6e9ffb168 Use url params for explore state
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
2018-07-17 12:56:05 +02:00
David Kaltschmidt f67b27e009 Dont parse empty explore state from url
- only parse url state if there is any
- prevents parse exception in the console on empty explore state
2018-07-17 12:24:04 +02:00
Torkel Ödegaard e318489bd4 Fix default browser th font-weight 2018-07-17 11:56:33 +02:00
Daniel Lee 8ff055b1d5 Merge pull request #12624 from calebtote/patch-1
Adding eval_data to alerts query results
2018-07-17 10:23:08 +02:00
Caleb Tote 10aaf7b506 Adding eval_data to alerts query results 2018-07-16 12:38:42 -04:00
Torkel Ödegaard c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +02:00
Daniel Lee a1f0dffe01 nginx: update to docker block
Adds commented out settings in nginx conf
for testing basic auth and auth proxy
2018-07-16 15:09:42 +02:00
Torkel Ödegaard 4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +02:00
Torkel Ödegaard f0508aa526 Merge branch 'master' of github.com:grafana/grafana 2018-07-16 13:52:34 +02:00
David Kaltschmidt 1f74b298c4 Remove string casting for template variables in prometheus 2018-07-16 13:02:36 +02:00
Daniel Lee 0b210a6f5d ldap: docker block readme update 2018-07-16 12:47:22 +02:00
David Kaltschmidt 1efe34e6cf Make prometheus value formatting more robust
- prometheus datasources passes its own interpolator function to the
  template server
- that function relies on incoming values being strings
- some template variables may be non-strings, e.g., `__interval_ms`,
  which throws an error

This PR makes this more robust.
2018-07-16 12:40:55 +02:00
Torkel Ödegaard 09c3569caa Update README.md 2018-07-16 12:36:35 +02:00
Torkel Ödegaard c6bcf13d78 Devenv testdata dashboards (#12615)
* devenv: working on dev env setup & dashboards

* devenv: refactored testdata app to a built in datasource instead, and moved dashboards to a devenv provisioned dashboards
2018-07-16 03:12:13 -07:00
David a13b4f2b3f Merge pull request #12596 from grafana/davkal/explore-datasource-selector
Explore Datasource selector
2018-07-16 11:13:29 +02:00
Torkel Ödegaard 2dd60f78d9 devenv: working on dev env setup & dashboards 2018-07-16 10:53:41 +02:00
Sven Klemm 0e608a08c2 fix test for query generation 2018-07-15 22:58:25 +02:00
Sven Klemm 7f348f3836 dont run queries if target has no table set 2018-07-15 22:27:33 +02:00
Sven Klemm 43686616a0 add query to find metric table 2018-07-15 22:26:32 +02:00
Sven Klemm b49d10104e add popover for metric column 2018-07-15 19:13:19 +02:00
Sven Klemm b28bf1a4f9 rename PostgresQueryBuilder to PostgresMetaQuery 2018-07-15 17:12:03 +02:00
Sven Klemm 070b556fd3 dont expand variables in rawSql 2018-07-15 17:02:26 +02:00
Sven Klemm 2fcb09b23d filter datatype for groupby suggestions 2018-07-15 16:23:47 +02:00
Sven Klemm 6e824e81bf fix rate special function when using group by 2018-07-15 15:14:12 +02:00
Sven Klemm c3c20ef2e2 remove unused import 2018-07-15 12:52:00 +02:00
Sven Klemm f85c9c012e refactor adding sqlPart 2018-07-15 12:26:22 +02:00
Sven Klemm f48060a1bb remove render code from sql_part 2018-07-15 09:53:22 +02:00
Sven Klemm d9648f1fe7 fix bug in query generation with metricColumn 2018-07-15 09:43:38 +02:00
Sven Klemm fa66645b0f refactor PostgresQuery 2018-07-15 09:36:49 +02:00
Sven Klemm 844beb660d refactor PostgresQueryCtrl 2018-07-14 21:00:06 +02:00
Sven Klemm d7ed706e12 refactor PostgresQueryCtrl and PostgresQuery 2018-07-14 20:28:34 +02:00
Sven Klemm 2dc9d4e960 refactor addGroupBy and removeGroupByPart 2018-07-14 16:46:53 +02:00
Sven Klemm 569a8567f9 use let for variable declaration 2018-07-14 11:32:00 +02:00
Sven Klemm d0c2b19c51 Add templateSrv to PostgresQuery tests 2018-07-14 11:05:35 +02:00
Sven Klemm b745fab190 add tests for query generation 2018-07-13 22:29:10 +02:00
David Kaltschmidt eb2abe800b Reverted $q to Promise migration in datasource_srv 2018-07-13 22:28:14 +02:00
Mark Meyer 0f6e5e2953 Allow settting of default org id to auto-assign to (#12401)
Author:    Mark Meyer <mark@ofosos.org>
2018-07-13 12:14:40 -07:00
Tobias Skarhed 7ae844518c Remove unused SASS variables (#12603)
* Comment out unused vars

* Remove unused sass vars
2018-07-13 12:10:09 -07:00
Torkel Ödegaard 964620c38c fix: panel embedd scrolbar fix, fixes #12589 (#12595) 2018-07-13 05:07:04 -07:00
Sven Klemm 17591ca29f fix tests for postgres datasource 2018-07-13 10:15:55 +02:00
David Kaltschmidt 390090da05 Set datasource in deep links to Explore 2018-07-13 09:45:56 +02:00
Sven Klemm 693efda4d5 send timerange with metricFindQuery 2018-07-13 09:31:39 +02:00
David Kaltschmidt d06b26de26 Explore Datasource selector
Adds a datasource selector to the Explore UI. Only datasource plugins
that have `explore: true` in their `plugin.json` can be selected.

- adds datasource selector (based on react-select) to explore UI
- adds getExploreSources to datasource service
- new `explore` flag in datasource plugins model
- Prometheus plugin enabled explore
2018-07-13 09:09:36 +02:00
Shane 756c08e713 changed you to your (#12590) 2018-07-12 23:56:37 -07:00
Sven Klemm bf21f1bf76 indent generated SQL 2018-07-12 22:36:41 +02:00
David 64c77febef Merge pull request #12586 from dehrax/12075-iframe-scroll
Prevent scroll on focus for iframe
2018-07-12 16:10:06 +02:00
Tobias Skarhed 7361d352bf Add comments 2018-07-12 15:38:41 +02:00
David 030d06331f Merge pull request #12585 from grafana/davkal/fix-plugin-css-loader-2
Fix freezing browser when loading plugin
2018-07-12 14:51:45 +02:00
David Kaltschmidt 81e62e1051 Fix freezing browser when loading plugin
- broken since 4d2dd2209
- `*` was previously working as a path matcher, but freezes browser when
  used with new cache-busting plugin loader
- changed matcher to be `/*`
2018-07-12 13:16:41 +02:00
Sven Klemm a24a6624e3 handle counter overflow and resets in rate 2018-07-12 13:15:19 +02:00
ryan 14d816aff9 Merge remote-tracking branch 'grafana/master'
* grafana/master: (29 commits)
  skip backend request if extended statistics is invalid. (#12495)
  Refactor team pages to react & design change (#12574)
  (prometheus) prevent error to use $__interval_ms in query (#12533)
  fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554)
  Add support for skipping variable value in URL, fixes #12174 (#12541)
  Don't build-all for PRs
  fix: requests/sec instead of requets (#12557)
  Add folder name to dashboard title (#12545)
  Fix css loading in plugins (#12573)
  Add new sequential color scales
  move go vet out of scripts and fixing warning (#12552)
  Cleanup and remove some jest.fn()
  Remove irrelevant tests and templateSrv stub
  Update CHANGELOG.md
  fix diff and percent_diff (#12515)
  Update lodash/moment version (#12532)
  Add mock to test files
  Create new instance in beforeEach
  Remove comments
  Karma to Jest: Cloudwatch datasource
  ...
2018-07-12 11:39:34 +02:00
Sven Klemm 0935526d23 partition by metricColumn when using increase 2018-07-12 10:13:21 +02:00
Sven Klemm bbe7b9b908 add rate and increase special functions 2018-07-12 09:57:04 +02:00
Torkel Ödegaard 211e0f2199 wip: another baby step, another million to go 2018-07-11 12:11:21 -07:00
Torkel Ödegaard 902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -07:00
Mitsuhiro Tanda 9b50c9038b skip backend request if extended statistics is invalid. (#12495)
* check extended statistics pattern

* check extended statistics pattern

* Revert "check extended statistics pattern"

This reverts commit 52c7b1a972636d5f5729e64ae5e00e6fae329257.

* add test

* fix test
2018-07-11 11:23:38 -07:00
Torkel Ödegaard c03764ff8a Refactor team pages to react & design change (#12574)
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
2018-07-11 11:23:07 -07:00
Mitsuhiro Tanda 18a8290c65 (prometheus) prevent error to use $__interval_ms in query (#12533)
* prevent error to use $__interval_ms in query

* add test

* prevent error to use $__interval_ms in query
2018-07-11 11:13:47 -07:00
Torkel Ödegaard b4e0ace7a2 fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Łukasz Gryglicki 24f395f986 Add support for skipping variable value in URL, fixes #12174 (#12541)
* New rebase

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>

* Lint

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>
2018-07-11 10:06:36 -07:00
nikoalch f34f5008ba Update mac.md
added local login info
2018-07-11 08:15:23 -07:00
nikoalch a0e1f58815 Update windows.md 2018-07-11 08:14:25 -07:00
nikoalch bcb11d6747 Update rpm.md
added local login info
2018-07-11 08:13:48 -07:00
nikoalch e944803f10 Update debian.md
added local login info
2018-07-11 08:13:15 -07:00
Torkel Ödegaard 2c22a7b4ba Don't build-all for PRs 2018-07-11 13:31:34 +02:00
Sven Klemm 2784a2df6b Refactor value column SQL generation 2018-07-11 13:03:06 +02:00
Sven Klemm 9ba42f63f1 Refactor metric column sql generation 2018-07-11 12:33:37 +02:00
Rollulus Rouloul 2fbf2bba4e fix: requests/sec instead of requets (#12557) 2018-07-11 03:33:19 -07:00
Tobias Skarhed cfa555b569 Add folder name to dashboard title (#12545)
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
2018-07-11 03:31:07 -07:00
David 4d2dd22095 Fix css loading in plugins (#12573)
- allow css loader to be imported again (wasnt prefixed by plugin)
2018-07-11 03:29:19 -07:00
Sven Klemm a86e77fc68 Refactor group by query generation 2018-07-11 12:20:24 +02:00
Sven Klemm b9edc3c611 Refactor where clause generation 2018-07-11 11:50:02 +02:00
Sven Klemm 5dd236bf05 refactor SQL generation for value columns 2018-07-11 11:09:28 +02:00
Sven Klemm 772825ed09 Refactor time column sql generation 2018-07-11 11:00:12 +02:00
Sven Klemm c5bde0ef45 Refactor render function on PostgresQuery 2018-07-11 10:50:49 +02:00
Sven Klemm 1d711924bc Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-11 10:21:13 +02:00
Sven Klemm c8a11d597f prepare sql part for special functions 2018-07-10 21:43:57 +02:00
Sven Klemm 0e610cad1b set query gui as default handle old panels gracefully 2018-07-10 21:40:59 +02:00
Bryan T. Richardson daf0c374b3 Added BurstBalance metric to list of AWS RDS metrics. 2018-07-10 10:11:39 -06:00
Sven Klemm 9d5b4cb91d dont throw exception for unknown types 2018-07-10 14:45:36 +02:00
Tobias Skarhed 4ee4ca99be Prevent scroll on focus for iframe 2018-07-10 12:54:45 +02:00
Sven Klemm e8e24f6139 add alias when adding group by 2018-07-10 11:32:23 +02:00
Dominic Smith 5578097210 Add new sequential color scales
* Add new sequential color scales

* Simplify inversion logic
2018-07-10 12:17:55 +03:00
Sven Klemm 6e7161f238 add aggregates when adding group by 2018-07-10 11:14:00 +02:00
David 9595f992b9 Merge pull request #12496 from dehrax/12224-prostgres-ds
Karma to Jest: 3 data sources
2018-07-10 11:13:44 +02:00
Sven Klemm 483e7c0163 remove superfluous braces 2018-07-10 10:21:02 +02:00
Sven Klemm dc93055a10 add column alias when add aggregate function 2018-07-10 10:19:30 +02:00
yogy rahmawan 8b32dc5847 move go vet out of scripts and fixing warning (#12552) 2018-07-09 23:25:32 -07:00
Sven Klemm 5a307e80aa fix enter in sql_part_editor 2018-07-09 22:43:50 +02:00
Sven Klemm bfc751542c fix editing expression parts 2018-07-09 22:38:29 +02:00
Torkel Ödegaard dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Sven Klemm f140967423 rename inputBlur to switchToLink 2018-07-09 22:00:50 +02:00
Torkel Ödegaard 761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Tobias Skarhed e51f208a49 Cleanup and remove some jest.fn() 2018-07-09 15:42:34 +02:00
Torkel Ödegaard e052e165e9 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:31 +02:00
Torkel Ödegaard 4fd2107071 Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:16 +02:00
Sven Klemm 02abda7d92 fix spelling 2018-07-09 14:47:59 +02:00
Sven Klemm 2d951ba611 add current value to dropdown if its not in resultset 2018-07-09 14:27:10 +02:00
Sven Klemm 6a981d39d8 Revert "show current value in dropdown when its not part of list"
This reverts commit 76275cae37.
2018-07-09 13:04:55 +02:00
Tobias Skarhed 6670acd082 Remove irrelevant tests and templateSrv stub 2018-07-09 12:52:56 +02:00
David 25bcdbcab1 Merge pull request #12284 from grafana/davkal/queryfield-refactor
Query field refactorings to support external plugins
2018-07-09 11:29:59 +02:00
Sven Klemm 76275cae37 show current value in dropdown when its not part of list 2018-07-09 11:22:03 +02:00
Torkel Ödegaard d85fa66fb4 redid redux poc, old branch was to old and caused to many conflicts 2018-07-09 10:28:20 +02:00
Torkel Ödegaard 3740d56491 wip: redux poc 2018-07-09 09:17:38 +02:00
Torkel Ödegaard 5a925461f1 Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Jesse Tane 677117fb03 fix diff and percent_diff (#12515)
* make diff and percent_diff tests more realistic

* fix diff and percent_diff

* include @marefr's additional tests
2018-07-08 21:58:34 -07:00
Mitsuhiro Tanda 77220456b6 improve error message 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda 4c59be4f5b generate unique id when variable is multi 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda 40ed235b3b support GetMetricData 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda 077cf9a343 dep ensure 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda 664944980a update aws-sdk-go 2018-07-09 13:11:49 +09:00
Ryan McKinley f53e166114 Update lodash/moment version (#12532)
* tabs to spaces

testing commit permisions :)

* revert

* Update lodash and moment
2018-07-08 13:06:08 -07:00
Torkel Ödegaard 51f8d3ca42 fix: minor css change 2018-07-08 13:03:22 -07:00
Torkel Ödegaard 8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
ryan 5425b76e33 Merge remote-tracking branch 'grafana/master'
* grafana/master:
  Tabs to spaces in tslint (#12529)
2018-07-08 18:30:24 +02:00
Ryan McKinley dca22fd151 Tabs to spaces in tslint (#12529)
* tabs to spaces

testing commit permisions :)

* revert

* tabs to spaces
2018-07-08 07:48:05 -07:00
Torkel Ödegaard 50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
ryan fc5dba27b8 revert 2018-07-08 11:08:01 +02:00
ryan 6e4b199bc2 tabs to spaces
testing commit permisions :)
2018-07-08 11:07:01 +02:00
Sven Klemm 09c06ced14 formatting 2018-07-07 21:22:12 +02:00
Sven Klemm 5b5dcabd22 add None to metric column suggestions 2018-07-07 21:21:11 +02:00
Sven Klemm 3f4c808cc5 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-07 20:54:33 +02:00
Sven Klemm 8490ae41b6 handle pre query gui queries gracefully 2018-07-07 20:41:24 +02:00
Sven Klemm eb170e741b dont break on panels that dont have rawQuery set 2018-07-07 19:59:25 +02:00
Sven Klemm b2b4860bdb refactor transformToSegments 2018-07-07 19:43:21 +02:00
Torkel Ödegaard b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard 645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Marcus Efraimsson 922371ba76 changelog: add notes about closing #12379
[skip ci]
2018-07-06 17:48:39 +02:00
Marcus Efraimsson 319488676f Merge pull request #12521 from grafana/davkal/fix-datasource-sort
Fix datasource sorting with template variables
2018-07-06 16:18:02 +02:00
David Kaltschmidt 7ddcaf22d5 Fix datasource sorting with template variables
- fixes sorting when template variables are present
- simplified existing test cases
- added test to cover variable usage in datasource service
2018-07-06 15:32:08 +02:00
Torkel Ödegaard dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Marcus Efraimsson f2980bb978 changelog: add notes about closing #12484
[skip ci]
2018-07-06 12:55:12 +02:00
Marcus Efraimsson cbdf6ef355 changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:53:10 +02:00
Marcus Efraimsson 1db067f2ad Merge pull request #12511 from alexanderzobnin/fix-12484
Prometheus heatmap: fix unhandled error when some points are missing
2018-07-06 12:50:04 +02:00
Sven Klemm e4b4b3a772 rename quoteLiteral to quoteIdentAsLiteral 2018-07-06 12:38:43 +02:00
Marcus Efraimsson af434df5a3 changelog: add notes about closing #12506
[skip ci]
2018-07-06 12:35:19 +02:00
Marcus Efraimsson 926892749f Merge pull request #12518 from grafana/12506_dash_links
Fix links not updating after changing variables
2018-07-06 12:33:19 +02:00
Marcus Efraimsson 5e4d6958d6 fix links not updating after changing variables 2018-07-06 11:54:37 +02:00
Sven Klemm a63298bca2 remove unused function removeSelect 2018-07-06 11:25:20 +02:00
Sven Klemm d9db3d1402 put updateParam back in 2018-07-06 11:24:49 +02:00
Sven Klemm 6143924ec6 fix where clause generation 2018-07-06 10:56:47 +02:00
Sven Klemm 7600c6efcb remove hardcoded $__timeFilter, make macros functional in where clause 2018-07-06 10:38:52 +02:00
Sven Klemm 8ed210c8d5 remove dead code, make label more flexible 2018-07-06 10:38:18 +02:00
Sven Klemm 85ab1cfa8f fix constraint removal 2018-07-06 09:28:34 +02:00
Torkel Ödegaard c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Sven Klemm d8c7756489 dont autoquote, suggest quoted values if requried 2018-07-05 21:36:39 +02:00
Torkel Ödegaard 447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard 09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07:00
Alexander Zobnin 36f08994cc prometheus heatmap: fix unhandled error when some points are missing 2018-07-05 16:33:52 +03:00
Marcus Efraimsson 50a522d418 fix caret for help button is ds http settings 2018-07-05 13:01:10 +02:00
Sven Klemm 3f614e635b do not autoquote identifiers 2018-07-05 11:27:19 +02:00
Sven Klemm c604651092 fix group by ui 2018-07-05 10:19:22 +02:00
Marcus Efraimsson 240cf63ba6 changelog: add notes about closing #11618 #11619 2018-07-04 20:07:43 +02:00
Marcus Efraimsson d90d4ce55d Merge pull request #12402 from AustinWinstanley/macros/sql
mysql,mssql: improve $__timeFilter, $__timeFrom, $__timeTo macros

The $__timeFilter macro now uses a BETWEEN with timestamps instead of 
comparing epochs
The $__timeFrom and $__timeTo macros now return strings of format 
YYYY-MM-DDThh:mm:ssZ instead of epoch
2018-07-04 20:01:43 +02:00
Sven Klemm aacf555985 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 18:59:23 +02:00
Sven Klemm 3595436614 fix where constraint handling 2018-07-04 18:57:55 +02:00
Sven Klemm 7d30ca04de remove dead code from sql_part
fix where clause query generation
2018-07-04 15:37:06 +02:00
Sven Klemm 3b632510fb code formatting 2018-07-04 15:20:52 +02:00
Tobias Skarhed 74bf80962d Add mock to test files 2018-07-04 14:32:22 +02:00
Tobias Skarhed 962340bcd1 Create new instance in beforeEach 2018-07-04 14:32:22 +02:00
Tobias Skarhed a37a0c7be3 Remove comments 2018-07-04 14:32:22 +02:00
Tobias Skarhed 42ba0dc73f Karma to Jest: Cloudwatch datasource 2018-07-04 14:32:22 +02:00
Tobias Skarhed d4bd52139a Karma to Jest: MySQL datasource 2018-07-04 14:30:36 +02:00
Tobias Skarhed 3bbe39c5ad Karma to Jest: postgres datasource 2018-07-04 14:30:36 +02:00
Marcus Efraimsson ea9964cfa1 Merge pull request #12493 from dehrax/12224-datasource-elastic
Karma to Jest: elasticsearch datasource
2018-07-04 14:03:25 +02:00
Marcus Efraimsson e8ee1be5e4 Merge pull request #12502 from Nexucis/feature/api-doc-improve
Fix HTTP-API admin doc
2018-07-04 13:52:13 +02:00
Tobias Skarhed d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00
Tobias Skarhed 12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed 8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed 80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed 69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed 12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Marcus Efraimsson a8970a4de9 run enterprise build only on master for now 2018-07-04 13:09:42 +02:00
Augustin Husson 86a574cc50 refix the settings indentation 2018-07-04 12:30:23 +02:00
Augustin Husson 991a4b1663 update stats admin doc 2018-07-04 12:26:30 +02:00
Augustin Husson 01fc6c5d95 fix json indentation 2018-07-04 12:23:10 +02:00
Sven Klemm fee36b2b35 include where constraints in query generation 2018-07-04 12:22:45 +02:00
Marcus Efraimsson d2f31a716f remove unnecessary conversions 2018-07-04 12:16:39 +02:00
Sven Klemm ced0a5828f rearrange elements of query builder 2018-07-04 11:56:26 +02:00
Sven Klemm 9847c2186f mv query_part to sql_part 2018-07-04 11:39:58 +02:00
Sven Klemm 19dcc1f41a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 10:12:27 +02:00
Marcus Efraimsson 723a894fc5 changelog: update
[skip ci]
2018-07-03 19:59:34 +02:00
Marcus Efraimsson 634c77469d changelog: add notes about closing #11818
[skip ci]
2018-07-03 19:58:19 +02:00
Marcus Efraimsson faf2ab4249 changelog: add notes about closing #12460
[skip ci]
2018-07-03 19:54:09 +02:00
Marcus Efraimsson 512e7f8567 changelog: add notes about closing #8186
[skip ci]
2018-07-03 19:50:21 +02:00
Marcus Efraimsson 60792d57dd changelog: add notes about closing #12379
[skip ci]
2018-07-03 19:44:21 +02:00
Marcus Efraimsson 27aa1cd568 changelog: add notes about closing #12362
[skip ci]
2018-07-03 19:41:34 +02:00
Torkel Ödegaard 1f97df46c1 devenv: open ldap docker block now prepopulating data with correct member groups 2018-07-03 12:58:17 +02:00
Leonard Gram 1586a42a71 ci: Only publish grafana enterprise packages tagged with enterprise. 2018-07-03 09:25:51 +02:00
Martin Packman 6046c8b4ca Make table sorting stable when null values exist (#12362)
Currently if a null appears in a table column, for instance in data
returned by postgres, sorting on that gives an arbitrary order. This
is due to null being neither greater or less than any string, which
makes the sort unstable.

Change the table sort function to compare on nullness first. Note
this is a slight behaviour change for numbers, which would otherwise
treat null and 0 as equivalent.

Signed-off-by: Martin Packman <gzlist@googlemail.com>
2018-07-02 11:14:41 -07:00
David 0d1f7c8782 Fix bar width issue in aligned prometheus queries (#12483)
* Fix bar width issue in aligned prometheus queries

This was broken because null values were filled in with unaligned times.

* use aligned times for result transformation
* add tests

An earlier version of this fix aligned the times again in the transformer, but
I think it's safe to only deal with aligned times in the response.

* Fixed prometheus heatmap tranformer test

The interval needs to be 1 to prevent step alignment.
2018-07-02 11:04:36 -07:00
zicklam a89351e8e0 correct example (#12481)
foo.bar.com in description, but foo.bar in configuration.
Updated description, makes more sense then changing the configuration :)
2018-07-02 09:01:42 -07:00
Torkel Ödegaard 37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Leonard Gram 5e08bf5130 test: fixed usage of wrap in tests. 2018-07-02 17:13:59 +02:00
Leonard Gram 4245f0ce11 ci: typo 2018-07-02 16:10:20 +02:00
Leonard Gram 8d6797c367 ci: publishes grafana enterprise to s3. 2018-07-02 16:05:23 +02:00
Torkel Ödegaard 6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard b8724ae0c4 refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Tobias Skarhed 2941dff428 Karma to Jest: datasource_srv (#12456)
* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* alerting: only log when screenshot been uploaded

* Remove comments

* Karma to Jest: datasource_srv

* Sort function differs between Karma and Jest

* Fix error based on .sort() implementation

* Remove Karma test

* Remove comments

* Remove console.log

* Remove console.log

* Change sorting and add test for default data source
2018-07-02 04:18:23 -07:00
Torkel Ödegaard 10e86eda69 fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474) 2018-07-01 23:35:50 -07:00
Mitsuhiro Tanda aa1b5959da omit extra template refresh (#12454) 2018-07-01 22:56:24 -07:00
Torkel Ödegaard ab9e1b35cd wip: minor progress on DataPanel 2018-07-01 17:34:42 +02:00
Carl Bergquist 861af4cb97 Improve extensions build. (#12461)
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
2018-07-01 07:01:43 -07:00
Sven Klemm 1601f6d17c [mysql] fix $__timeGroup rounding (#12469)
* fix $__timeGroup rounding for mysql

* revert accidentally commented out line
2018-07-01 06:59:05 -07:00
Sven Klemm f017c04a65 [mssql] fix $__timeGroup rounding (#12470)
* fix $__timeGroup rounding for mssql

* revert enabling of mssql integration tests
2018-07-01 06:57:02 -07:00
Sven Klemm c2c22c142b [postgres] fix timeGroup macro rounding (#12468)
* fix timeGroup tests to check for correct grouping

* do explicit floor rounding in $__timeGroup macro

* fix typo in comments
2018-07-01 06:55:46 -07:00
Will Weber c03d527d25 pkg/social/github: Allow changing of userinfo data (#12471)
Experienced a problem where a user whose email changed was no longer
able to login. By using the ID as a primary identifier, we can avoid
conflicts of this variety within the github OAuth provider.
2018-07-01 05:56:16 -07:00
bergquist 66c56e7bbe notifications: dont return error if one notifer failed 2018-06-30 23:14:18 +02:00
Sven Klemm 410449b5e7 use sqlPart for ui parts 2018-06-30 11:11:34 +02:00
Sven Klemm d26cacccd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-30 10:49:17 +02:00
Carl Bergquist 88783d6e0a avoid calling os.Exit outside main.go (#12459)
I don't think we should call os.Exit outside main.go. Calling
os.Exit breaks the application control flow.
2018-06-29 22:48:26 -07:00
Marcus Efraimsson 845724e8b9 update mysql/mssql query/annotation help sections 2018-06-29 20:39:06 +02:00
Marcus Efraimsson 7a4858dd11 docs: update folders api 2018-06-29 20:24:02 +02:00
Austin Winstanley 59675dc564 Changed documentation for MSSQL and MySQL to reflect macro changes 2018-06-29 13:07:48 -05:00
Marcus Efraimsson 2835acf48c docs: update scripted dashboard for v5 2018-06-29 19:36:15 +02:00
Marcus Efraimsson 4530925b9f docs: update scripted dashboard for v5 2018-06-29 19:30:29 +02:00
Marcus Efraimsson cdaeb1578d docs: update organisation http api
make the distinction clearer between /api/org and /api/orgs and that
basic auth must be used for the /api/orgs resource
2018-06-29 19:10:42 +02:00
Marcus Efraimsson aae3b568f3 docs: upd windows installation 2018-06-29 18:21:56 +02:00
bergquist e91e3ea771 notifications: send notifications synchronous 2018-06-29 16:16:09 +02:00
bergquist d31c7bc6a4 Merge branch 'master' into alerting_reminder
* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...
2018-06-29 15:44:20 +02:00
bergquist 396f8e6464 notifications: read without tran, write with tran 2018-06-29 15:15:31 +02:00
bergquist d440b9a8d1 registry: adds more comments 2018-06-29 11:58:54 +02:00
bergquist f0f6d0e915 registry: adds comments to interfaces 2018-06-29 11:45:32 +02:00
Marcus Efraimsson cb706bd059 changelog: update
[skip ci]
2018-06-29 10:52:42 +02:00
Marcus Efraimsson 32793350b8 changelog: update
[skip ci]
2018-06-29 10:49:36 +02:00
Marcus Efraimsson 0dd0b65900 changelog: add notes about closing #12438
[skip ci]
2018-06-29 10:48:50 +02:00
Marcus Efraimsson 59756863df Merge pull request #12439 from grafana/fix-log-close-too-early
Fix: Log close (ie flush) was done too early, before final shutdown log
2018-06-29 10:45:14 +02:00
bergquist c4292b43f5 alerting: only log when screenshot been uploaded 2018-06-29 09:58:58 +02:00
bergquist ce88e4b927 fixes typos
closes #12453
2018-06-29 09:35:31 +02:00
Austin Winstanley 9823da1cc5 Reverted yarn.lock to master 2018-06-29 03:54:43 +00:00
Austin Winstanley afee29be68 Merge branch 'master' into macros/sql 2018-06-29 03:51:05 +00:00
Austin Winstanley a0e8437f8f Used PostgreSQL TSDB as a model the set up the __timeFilter, __timeFrom, and __timeTo macros for Microsoft SQL and MySQL 2018-06-29 03:48:14 +00:00
Austin Winstanley 84af033281 Merge branch 'master' of https://github.com/grafana/grafana 2018-06-29 03:32:18 +00:00
Austin Winstanley d663122244 Merge branch 'master' of https://github.com/grafana/grafana into macros/sql 2018-06-29 03:31:23 +00:00
Marcus Efraimsson fb2b2c9f65 changelog: add notes about closing #12444
[skip ci]
2018-06-28 16:39:38 +02:00
Marcus Efraimsson d226383c4e Merge pull request #12444 from grafana/revert-12299-10707_whitelist
Revert "auth proxy: use real ip when validating white listed ip's"
2018-06-28 16:31:26 +02:00
Marcus Efraimsson 8af5da7383 Revert "auth proxy: use real ip when validating white listed ip's" 2018-06-28 15:43:33 +02:00
Daniel Lee 7a2be69abc changelog: adds note for #11892 2018-06-28 14:46:40 +02:00
Daniel Lee 8537f10285 Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option
Make colorization of prefix and postfix optional in singlestat
2018-06-28 14:42:48 +02:00
Marcus Efraimsson 4c4bd2ebba changelog: add notes about closing #12430
[skip ci]
2018-06-28 14:27:41 +02:00
Marcus Efraimsson ab458061e6 Merge pull request #12441 from grafana/12430_fix
Fix footer CSS issue
2018-06-28 14:25:08 +02:00
Marcus Efraimsson 54420363d3 fix footer css issue 2018-06-28 14:02:42 +02:00
Tobias Skarhed af0a4a6039 Karma to Jest: 3 test files (#12414)
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
2018-06-28 04:43:23 -07:00
Torkel Ödegaard 7a7c6f8fab fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438 2018-06-28 04:38:23 -07:00
Torkel Ödegaard 70c808130f react panels wip 2018-06-28 04:31:55 -07:00
Tobias Skarhed 443ff5deb4 Karma to Jest: value_select_dropdown (#12435)
* Begin Karma 2 Jest: value_select_dropdown

* Add return for Promise

* Remove Karma test
2018-06-28 03:10:36 -07:00
Dan Cech 3056d9a80e support passing api token in Basic auth password (#12416) 2018-06-28 03:08:32 -07:00
Tobias Skarhed c2381f088f Add disabled styles for checked checkbox (#12422) 2018-06-28 03:02:49 -07:00
Marcus Efraimsson 3cf6a1a94b changelog: add notes about closing #11920
[skip ci]
2018-06-27 15:17:15 +02:00
Marcus Efraimsson 18032b374b changelog: add notes about closing #11920
[skip ci]
2018-06-27 15:11:44 +02:00
Marcus Efraimsson f1ab1a26e9 changelog: update
[skip ci]
2018-06-27 14:48:55 +02:00
Marcus Efraimsson 6fa87e6278 docs: upd what's new in v5.2 2018-06-27 14:20:36 +02:00
Marcus Efraimsson b011444246 release 5.2.0 2018-06-27 11:39:04 +02:00
Marcus Efraimsson e378f6db88 docs: update index with link to what's new in 5.2 instead of 5.0 2018-06-27 11:35:53 +02:00
Torkel Ödegaard 682c792dfb wip: react panels editor mode, tabs working 2018-06-26 12:07:41 -07:00
Marcus Efraimsson ec3a4e105f changelog: add notes about closing #12385
[skip ci]
2018-06-26 18:11:56 +02:00
Marcus Efraimsson 06daae2179 Merge pull request #12412 from grafana/12393_login
login: fix layout issues
2018-06-26 18:01:54 +02:00
Torkel Ödegaard 2f5bcd37ec react panels wip 2018-06-26 16:45:42 +02:00
Torkel Ödegaard cec70c1ed8 feat: panels v2, metrics-tab loading 2018-06-26 16:32:01 +02:00
Torkel Ödegaard 0f97d38485 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-26 16:07:12 +02:00
Marcus Efraimsson 8d535dd90d docs: upd what's new in v5.2
[skip ci]
2018-06-26 15:42:34 +02:00
Marcus Efraimsson e256c61b54 docs: upd what's new in v5.2 2018-06-26 15:37:22 +02:00
Marcus Efraimsson 9f02927761 login: fix layout issues 2018-06-26 15:19:57 +02:00
Marcus Efraimsson bd805544c5 build: yarn should be included out of the box on circle ci 2018-06-26 15:19:04 +02:00
Torkel Ödegaard 1420147ccb Merge branch 'master' into react-panels 2018-06-26 15:18:54 +02:00
bergquist 8ff538be07 notifier: handle known error first 2018-06-26 14:13:45 +02:00
Augustin ef0bf9f701 ensure that if the dasboardID is negative, it will not bypass the checking of the right (#12398) 2018-06-26 05:12:20 -07:00
Marcus Efraimsson 5a2cf5863d Merge pull request #12399 from grafana/12140_docs
docs: update installation instructions
2018-06-26 10:37:22 +02:00
Marcus Efraimsson db12e8d52d changelog: add notes about closing #11968
[skip ci]
2018-06-26 10:32:32 +02:00
Marcus Efraimsson ceba0490f8 Merge pull request #12395 from grafana/11968_variable_key_value
Set correct text in drop down when variable is present in url
2018-06-26 10:29:21 +02:00
Torkel Ödegaard 713a87fb5b Webpack 4 (WIP) (#12098)
* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* upgrade ts loader

* simplified splitChunks

* upgrade circle node image to v8

* webpack: minor changes, using the new mode option, removed unused awesome-typescript loader, investigating karma issue but no solution yet

* fix: change angular mocks version restriction to be more strict

* add babel-loader for HMR support, fix karma debug runner

* babel-loader to yarn.lock

* webpack: changed from ExtractTextPlugin  to MiniCssExtractPlugin, and updated the minification step to use new webpack4 optimization config section

* webpack: remove css minifcation from general css processing as it's done in the webpack optimization step

* limit vendors chunk to .ts and .js files

* fix: removed typescript compile error, wanted to see if we still got test failure for that

* tech: upgrade uglify-js, should be faster now
2018-06-26 01:28:37 -07:00
Aman e11f6f5cdf Make pre/postfix coloring checkboxes inactive when gauge is active 2018-06-26 13:06:26 +05:30
Sven Klemm 682c684df3 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-26 09:26:35 +02:00
bergquist f83306bb5b removes unused return object 2018-06-26 09:22:31 +02:00
Dan Cech 583df47c2f handle "dn" ldap attribute more gracefully (#12385)
* handle "dn" ldap attribute more gracefully

* use strings.ToLower
2018-06-26 00:14:55 -07:00
Torkel Ödegaard dd7a653db9 Update ROADMAP.md 2018-06-26 08:59:37 +02:00
Carl Bergquist 1165d098b0 Merge pull request #12407 from pengwk/patch-1
Fix typo
2018-06-26 08:30:05 +02:00
peng weikang e4669681c4 Fix typo 2018-06-26 14:04:54 +08:00
Austin Winstanley 7f166668f6 Merge branch 'master' into macros/sql 2018-06-25 20:14:25 +00:00
Austin Winstanley 52b475f965 Merge branch 'master' of https://github.com/grafana/grafana 2018-06-25 20:13:50 +00:00
Austin Winstanley c35c1d7270 Merge branch 'master' of https://github.com/grafana/grafana into macros/sql 2018-06-25 20:13:34 +00:00
Austin Winstanley 105b3d6804 Switched MySQL and MSSQL macros for timeFilter and related to use BETWEEN and calculate UNIX time server side instead of database side. Fixes #11618 #11619 2018-06-25 20:11:58 +00:00
Marcus Efraimsson 31239f33ed docs: update installation instructions 2018-06-25 17:22:31 +02:00
Carl Bergquist 175e95abb0 Merge pull request #12396 from bergquist/routing
routing: allows routes to be added to existing groups
2018-06-25 17:17:14 +02:00
bergquist 4a46dd886b routing: raise panic if duplicate routes are added 2018-06-25 16:58:49 +02:00
bergquist dbfafa1cb5 routing: allows routes to be added to existing groups
this enables services to add routing to ex /api
without causing conflicts.
2018-06-25 16:50:27 +02:00
Marcus Efraimsson c23f9a1f37 changelog: add notes about closing #11868
[skip ci]
2018-06-25 16:32:32 +02:00
Marcus Efraimsson 2b3bfd2f65 Merge pull request #12198 from grafana/11868_missing_phantom
enhance error message if phantomjs executable is not found
2018-06-25 16:27:12 +02:00
Marcus Efraimsson f106de0efd enhance error message if phantomjs executable is not found
if arm build, explain that phantomjs is not included by default in arm
builds. If not explain that phantom js isn't installed correctly
2018-06-25 16:06:52 +02:00
Torkel Ödegaard 132df4553c fix: annnotation api & sql issue 2018-06-25 16:03:38 +02:00
Marcus Efraimsson ed1fec8e0f changelog: add notes about closing #12248
[skip ci]
2018-06-25 15:24:12 +02:00
Marcus Efraimsson 98a7f258af Merge pull request #12392 from dehrax/12248-fix
Fix selecting current dashboard from search does not reload dashboard
2018-06-25 15:21:24 +02:00
Marcus Efraimsson 5280084480 set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
Augustin eb4d860fcb Light improve of massive delete annotation api (#12390)
* fix delete annotations

* fix self assignment

* add right unit test using admin role
2018-06-25 04:58:49 -07:00
Tobias Skarhed 762ee203fa Fix 12248 2018-06-25 13:46:33 +02:00
PedroD 3bf12e4ff5 Fixing wrong /public path, relative to the webpack.dev script, that would avoid webpack from cleaning previous builds. (#12351) 2018-06-25 04:45:47 -07:00
Marcus Efraimsson 7797a66b58 changelog: add notes about closing #12383
[skip ci]
2018-06-25 13:17:33 +02:00
Marcus Efraimsson 1726f6358f Merge pull request #12383 from CorpGlory/master
Set $rootScope in DatasourceSrv
2018-06-25 11:14:55 +02:00
bergquist e0ac31a28a changelog: adds note about closing #12313 2018-06-25 08:02:51 +02:00
Carl Bergquist 15bbe81fed Merge pull request #12387 from AustinWinstanley/master
Return a 404 when deleting a datasource through the API if it doesn't…
2018-06-25 07:49:18 +02:00
Austin Winstanley defb0396b7 Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313 2018-06-22 21:15:36 -05:00
rozetko 97db9ece98 Set $rootScope in DatasourceSrv 2018-06-22 16:17:02 +03:00
Aman 1dd65f7a39 Add options to colorize prefix and postfix in singlestat 2018-06-22 14:50:04 +05:30
Daniel Lee b2187b70a7 Merge pull request #11990 from mtanda/issue_11925
fix "Cloudwatch panel does not allow arbitrary variable values in query"
2018-06-21 18:00:49 +02:00
bergquist eaf5b1c1cf devenv: adds dashboard with multiple rows 2018-06-21 16:31:10 +02:00
Daniel Lee 75e378b689 Merge pull request #12367 from dehrax/12224-history-ctrl
Karma to Jest: history_ctrl
2018-06-21 14:52:01 +02:00
bergquist 4b8b4e171a changelog: adds note about closing #10971 2018-06-21 14:31:55 +02:00
Carl Bergquist 828fb39ee2 Merge pull request #11643 from mrsiano/generic_oauth
Pass configured/auth headers to a Datasource.
2018-06-21 14:21:59 +02:00
mrsiano cc1e3a0e3c Pass configured/auth headers to a Datasource.
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
2018-06-21 14:58:05 +03:00
Daniel Lee 6871f4c14e Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb
Conditionally select a field to return in ResponseParser for InfluxDB
2018-06-21 12:25:15 +02:00
Tobias Skarhed 4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Carl Bergquist e17944db15 Merge pull request #12325 from albundy83/patch-1
Fix error in InfluxDB query
2018-06-21 10:57:26 +02:00
Marcus Efraimsson 8ba869ac72 changelog: add notes about closing #12359
[skip ci]
2018-06-21 10:50:28 +02:00
Marcus Efraimsson 45610ecd89 Merge pull request #12363 from grafana/12359_sign_rpm_packages
build: fix signing of multiple rpm packages
2018-06-21 10:45:09 +02:00
Marcus Efraimsson e617e23927 build: fix signing of multiple rpm packages 2018-06-21 10:27:59 +02:00
Marcus Efraimsson 8b5d78a63e docs: what's new in v5.2 and docker installation updates
[skip ci]
2018-06-20 18:53:17 +02:00
bergquist 503c8cd8ef tech: adds comments about route register code 2018-06-20 16:55:42 +02:00
Marcus Efraimsson cce9632837 changelog: add notes about closing issue
https://github.com/grafana/grafana-docker/issues/170
[skip ci]
2018-06-20 15:38:13 +02:00
Tobias Skarhed d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson 5a5601a8d2 changelog: add notes about 5.2.0-beta2
[skip ci]
2018-06-20 13:56:24 +02:00
Marcus Efraimsson 76df428ea2 changelog: add notes about closing #12240
[skip ci]
2018-06-20 13:54:57 +02:00
Marcus Efraimsson 3199287ce0 changelog: add notes about closing #12256
[skip ci]
2018-06-20 13:20:03 +02:00
Marcus Efraimsson 051ddb245d Merge pull request #12346 from grafana/12256_export
Make sure to process panels in collapsed rows when exporting dashboard
2018-06-20 13:17:32 +02:00
Marcus Efraimsson 9532cfee5f changelog: add notes about closing #11792
[skip ci]
2018-06-20 13:16:23 +02:00
Marcus Efraimsson 296a841685 Merge pull request #12123 from alexanderzobnin/fix-11792
graph: fix legend decimals precision calculation
2018-06-20 13:08:17 +02:00
Marcus Efraimsson ae07fc29e2 changelog: add notes about closing #12315
[skip ci]
2018-06-20 13:04:39 +02:00
Marcus Efraimsson 2cbec532ee Merge pull request #12345 from grafana/12315_dash_links
Fix dashboard drop down links
2018-06-20 13:00:17 +02:00
Marcus Efraimsson 4ef4a4d3a7 dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Torkel Ödegaard 1099daec38 wip: react panels, query editor loading from react PanelEditor view 2018-06-20 12:05:03 +02:00
Daniel Lee a795715d2f Merge pull request #12350 from grafana/12240_save_modal_regression
Fix regressions after save modal changes
2018-06-20 10:40:49 +02:00
Carl Bergquist 578a8e8f55 Merge pull request #12322 from bergquist/sqlstore_refactoring
expose session and transaction helpers to other services
2018-06-20 10:22:06 +02:00
Marcus Efraimsson 41ac8d4cd5 fix regressions after save modal changes of not storing time and variables per default
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
2018-06-20 09:52:29 +02:00
Torkel Ödegaard 230606146d wip: react panel minor progrss 2018-06-19 21:25:57 +02:00
Torkel Ödegaard 65b96e1161 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:46 +02:00
Torkel Ödegaard c74a1c18fb Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:01 +02:00
Torkel Ödegaard 13bc9f6fb2 updated 2018-06-19 17:30:10 +02:00
Tobias Skarhed 3a9a36d6cf Karma to Jest: history_srv (#12341)
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
2018-06-19 08:05:49 -07:00
Torkel Ödegaard db52ea66bd react panels minor progress 2018-06-19 16:57:55 +02:00
Marcus Efraimsson a2e08dc4e8 make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Marcus Efraimsson d450ec94eb changelog: add notes about closing #3132
[skip ci]
2018-06-19 15:04:49 +02:00
Marcus Efraimsson f73c04086c docs: update installation instructions 2018-06-19 15:00:45 +02:00
Torkel Ödegaard aa5c9f199a react panel minor progress 2018-06-19 14:51:57 +02:00
Daniel Lee e6c5a5a905 ldap: add note about config in Grafana 2018-06-19 14:41:17 +02:00
Marcus Efraimsson b1cf1acb71 Merge pull request #10970 from mmolnar/master
ldap: allow use of DN in group_search_filter_user_attribute and member_of
2018-06-19 14:40:05 +02:00
Daniel Lee 40d760622e ldap: add note to dockerfile 2018-06-19 14:30:50 +02:00
Marcus Efraimsson a60332d459 changelog: add notes about closing #12343
[skip ci]
2018-06-19 13:54:37 +02:00
Daniel Lee 94f39cb734 docs: Plugin review guidelines and datasource auth pages 2018-06-19 13:16:41 +02:00
Marcus Efraimsson 5377ad4e96 remove unused argument in default scenario of guardian test 2018-06-19 12:34:34 +02:00
Torkel Ödegaard 24d0b43e62 fix: fixed permission issue with api key with viewer role in dashboards with default permissions 2018-06-19 11:10:17 +02:00
Torkel Ödegaard 35403c1875 wip: react panel makeover mini progress 2018-06-19 08:42:41 +02:00
Tobias Skarhed 8666c77cc9 Karma to Jest: time_srv (#12303)
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
2018-06-18 09:47:23 -07:00
Tobias Skarhed 5bf72fc9f4 Karma to Jest: team_details_ctrl (#12321) 2018-06-18 07:54:56 -07:00
Grégoire Bellon-Gervais 7b3652af67 Fix error in InfluxDB query
Minor error in sql query to retrieve annotations
2018-06-18 16:10:40 +02:00
Torkel Ödegaard 542da8dc45 Merge branch 'master' into react-panels 2018-06-18 15:08:06 +02:00
bergquist 3479cf4b39 expose functions to use sessions 2018-06-18 14:50:36 +02:00
bergquist 2b849086a1 changelog: adds note about closing #11607
[skip ci]
2018-06-18 13:51:20 +02:00
Carl Bergquist 764a4247f5 Merge pull request #12274 from xapon/11607-cleanup
#11607 Cleanup time of temporary files is now configurable
2018-06-18 13:50:05 +02:00
bergquist dd7a185a91 test commit for checking github permissions
[skip ci]
2018-06-18 11:41:28 +02:00
Marcus Efraimsson 9a4ccdf388 changelog: add notes about closing #12278
[skip ci]
2018-06-18 11:28:33 +02:00
bergquist ffda5efc66 Merge branch 'master' into alerting_reminder
* master:
  changelog: add notes about closing #11076
  snapshot: copy correct props when creating a snapshot
  set current org when adding/removing user to org
  changelog: add notes about closing #10707
  Include the vendor directory when copying source in to Docker (#12305)
  changelog: adds note about closing #12199
  adds inTransactionCtx that calls inTransactionWithRetryCtx
  merge create user handlers
  transactions: start sessions and transactions at the same place
  cloudwatch: handle invalid time range
  make sure to use real ip when validating white listed ip's
  changelog: adds note about closing #12286
2018-06-18 11:26:31 +02:00
Marcus Efraimsson 9271e48513 Merge pull request #12317 from grafana/12278_snapshot_annotations
Copy correct annotation props when creating a snapshot
2018-06-18 11:24:04 +02:00
Marcus Efraimsson b72c45f735 changelog: add notes about closing #11076
[skip ci]
2018-06-18 11:22:55 +02:00
Marcus Efraimsson 004142a1e4 Merge pull request #12263 from grafana/11076_current_org
Set current org when adding/removing user to org
2018-06-18 11:19:42 +02:00
Marcus Efraimsson a738347957 snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
André Niemann 757e2b0b7e added comment to reason the id tag 2018-06-18 10:59:44 +02:00
Carl Bergquist d6f4313c2f Merge pull request #12203 from bergquist/bus_multi_dispatch
bus: support multiple dispatch in one transaction
2018-06-18 10:54:05 +02:00
Marcus Efraimsson 6d48d0a80c set current org when adding/removing user to org
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
2018-06-18 09:30:01 +02:00
Marcus Efraimsson ab9f0e8edd changelog: add notes about closing #10707
[skip ci]
2018-06-18 09:03:30 +02:00
Marcus Efraimsson 18167f1c18 Merge pull request #12299 from grafana/10707_whitelist
auth proxy: whitelist proxy ip instead of client ip
2018-06-18 09:00:41 +02:00
Tim Heckman a2ff7629e0 Include the vendor directory when copying source in to Docker (#12305)
This change updates the `.dockerignore` file to no longer contain the `vendor/`
directory. When a Go project provides a `vendor/` directory within the
repository, the best practice is to build that project using their vendored
dependencies. By putting it in the `.dockerignore` file we prevent consumers
from easily doing that.

The `vendor/` directory is used to include all of the dependencies needed to
build a project. This makes it so that we can reproducibly build the project, at
any given commit, because the dependencies will always be present. Also, using
the vendor directory avoids us needing to continually re-download all the
dependencies, and it protects us from build failures if GitHub is down or a
dependency gets removed or renamed.

In addition to the change above, this also removes an extra `/tmp` entry from
the `.dockerignore` file.

Fixes #12304

Signed-off-by: Tim Heckman <t@heckman.io>
2018-06-17 22:38:37 -07:00
bergquist 6782be80fd changelog: adds note about closing #12199 2018-06-16 16:59:15 +02:00
Carl Bergquist e2adb4ced5 Merge pull request #12302 from grafana/12199_cloudwatch_panic
cloudwatch: handle invalid time range
2018-06-16 16:57:23 +02:00
bergquist 83a12afc07 adds tests for journaling sql operations 2018-06-16 11:27:04 +02:00
Sven Klemm 6c7984a840 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-16 10:36:50 +02:00
bergquist c21938d4c4 use epoch to compare timestamp 2018-06-16 00:03:13 +02:00
bergquist 4c5fe68e7e adds inTransactionCtx that calls inTransactionWithRetryCtx 2018-06-15 21:57:13 +02:00
bergquist 1181e96799 merge create user handlers 2018-06-15 21:23:57 +02:00
bergquist da91b91b4b transactions: start sessions and transactions at the same place
this make it possible for handler to use `withSession` when
transactions is not nedded and `inTransactionCtx` if its needed
without knowing who owns the session/transaction
2018-06-15 20:52:57 +02:00
bergquist 72224dbe37 adds info about eval/reminder interval 2018-06-15 16:53:35 +02:00
bergquist 12bf5c225a tests for defaultShouldNotify 2018-06-15 16:27:20 +02:00
Marcus Efraimsson c02dd7462a cloudwatch: handle invalid time range 2018-06-15 15:48:25 +02:00
bergquist f4b089d551 notifications: make journaling ctx aware 2018-06-15 15:30:17 +02:00
Marcus Efraimsson b418e14bd9 make sure to use real ip when validating white listed ip's 2018-06-15 15:29:43 +02:00
Francisco Guimarães acdc2bf100 Adding Cloudwatch AWS/AppSync metrics and dimensions 2018-06-15 10:11:32 -03:00
bergquist 7632983c62 notifications: gather actions in one transaction 2018-06-15 14:27:16 +02:00
bergquist 0cfdebf0a2 Merge remote-tracking branch 'fork/bus_multi_dispatch' into alerting_reminder
* fork/bus_multi_dispatch:
  sql: adds tests for InTransaction
  bus: noop should still execute fn
  removes unused code
  bus: Dispatch now passes empty ctx if handler require it
  bus: dont start transaction when creating session
  bus: dont mix ctx/classic handlers
  bus: DispatchCtx can now invoke any handler
  refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
  refactoring: transaction manager PR #12203
  fixes typo in code
  check if admin exists or create one in one transaction
  replace begin/end with wrapper function
  bus: support multiple dispatch in one transaction
2018-06-15 13:17:24 +02:00
bergquist 4be6ef4ab3 changelog: adds note about closing #12286 2018-06-15 12:47:53 +02:00
bergquist 09e71e00a3 sql: adds tests for InTransaction 2018-06-15 12:46:20 +02:00
bergquist 03dae10e79 bus: noop should still execute fn 2018-06-15 12:46:20 +02:00
bergquist a3ee778ddb removes unused code 2018-06-15 12:46:20 +02:00
bergquist 9c1758b593 bus: Dispatch now passes empty ctx if handler require it 2018-06-15 12:46:20 +02:00
bergquist 9ca9a7c302 bus: dont start transaction when creating session 2018-06-15 12:46:20 +02:00
bergquist 629eab0b1e bus: dont mix ctx/classic handlers 2018-06-15 12:46:20 +02:00
bergquist e2275701d8 bus: DispatchCtx can now invoke any handler 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 5af0b924ff refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 442e0e437b refactoring: transaction manager PR #12203 2018-06-15 12:46:20 +02:00
bergquist 6775a82c82 fixes typo in code 2018-06-15 12:46:20 +02:00
bergquist 1bd31aa313 check if admin exists or create one in one transaction 2018-06-15 12:46:20 +02:00
bergquist 263572813a replace begin/end with wrapper function 2018-06-15 12:46:20 +02:00
bergquist 8143610024 bus: support multiple dispatch in one transaction
this makes it possible to run multiple DispatchCtx
in one transaction. The TransactionManager will
start/end the transaction and pass the dbsession
in the context.Context variable
2018-06-15 12:46:20 +02:00
bergquist 6cd83e182a Merge branch 'master' into alerting_reminder
* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...
2018-06-15 12:45:35 +02:00
Carl Bergquist e33d18701d Merge pull request #12287 from bergquist/fix_12286
Influxdb: add mode functions
2018-06-15 12:43:47 +02:00
Marcus Efraimsson f0254c201a Merge pull request #12215 from ryantxu/use-ng-if-for-time
use ng-if for the panel timeInfo
2018-06-15 12:16:48 +02:00
Marcus Efraimsson a02306bc75 Merge pull request #12295 from bergquist/docker_master
docs: adds info about grafana-dev container
2018-06-15 11:32:24 +02:00
bergquist 10d840b1cc docs: adds info about grafana-dev container 2018-06-15 11:07:23 +02:00
Marcus Efraimsson 551957fc4d changelog: add notes about closing #12282
[skip ci]
2018-06-15 10:57:19 +02:00
flopp999 2d1f59a9cc Added Litre/min and milliLitre/min in Flow (#12282)
units: Litre/min and milliLitre/min in Flow
2018-06-15 10:54:38 +02:00
Marcus Efraimsson 5f78ad583f remove papaparse dependency 2018-06-15 10:49:57 +02:00
Marcus Efraimsson 22c7c741eb Merge pull request #12252 from grafana/davkal/ifql-query
Internal Influx Flux plugin cleanup
2018-06-15 10:43:34 +02:00
Marcus Efraimsson b62322b128 Merge pull request #12288 from mlclmj/master
docs: HTTP Endpoint for Deleting an Organization
2018-06-15 10:37:51 +02:00
Marcus Efraimsson 96287a9061 Merge pull request #12294 from vincent-fuchs/patch-1
docs: delete_datasources -> deleteDatasources in provisioning
2018-06-15 10:33:03 +02:00
Vincent Fuchs c8becf57fa list name is deleteDatasources, not delete_datasources
fixes https://github.com/grafana/grafana/issues/12293
2018-06-15 12:19:53 +05:30
David Kaltschmidt d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Malcolm Jones 2765afc830 Document the endpoint for deleting an org 2018-06-14 15:28:54 -04:00
bergquist c63533f004 tests: rewrite into table tests 2018-06-14 20:33:36 +02:00
bergquist bf4ee9bcc6 influxdb: adds mode func to backend
closes #12286
2018-06-14 20:33:22 +02:00
Marcus Efraimsson 56628996b7 Merge pull request #12280 from dehrax/12224-elastic-response
karma to jest: 6 test files
2018-06-14 17:24:36 +02:00
David Kaltschmidt a9e1e5f346 Fix queryfield wrapper css 2018-06-14 16:20:48 +01:00
David Kaltschmidt bbe6ab5096 Fix Queryfield metrics field missing 2018-06-14 16:20:33 +01:00
David Kaltschmidt b2f497b100 batch DOM reads from query field typeahead 2018-06-14 16:20:21 +01:00
David Kaltschmidt 73ddf2c3ed hint support for typeahead 2018-06-14 16:20:09 +01:00
David Kaltschmidt 2ebda4bf4d Make suggestions an object 2018-06-14 16:19:55 +01:00
David Kaltschmidt 4113f7db47 Trigger typeahead on Ctrl-Space 2018-06-14 16:19:43 +01:00
David Kaltschmidt 0425b47791 refactor Explore query field 2018-06-14 16:19:29 +01:00
Marcus Efraimsson 0107491195 changelog: add notes about closing #11484
[skip ci]
2018-06-14 15:59:31 +02:00
Marcus Efraimsson 81d34137a8 Merge pull request #11484 from manacker/master
alerting: fix mobile notifications for microsoft teams notifier
2018-06-14 15:56:18 +02:00
Marcus Efraimsson e6135ffd4f changelog: add notes about closing #11233
[skip ci]
2018-06-14 15:39:32 +02:00
Marcus Efraimsson 9dd38031e4 Merge pull request #11233 from flopp999/patch-2
units: W/m2(energy), l/h(flow) and kPa(pressure)
2018-06-14 15:36:38 +02:00
Tobias Skarhed dbbd6b9b66 Remove import 2018-06-14 15:27:11 +02:00
Marcus Efraimsson 1626a66bab Merge pull request #12275 from dehrax/12224-exporter
karma to jest: exporter, playlist_edit_ctrl
2018-06-14 15:10:06 +02:00
Marcus Efraimsson 25e1d723c6 Merge pull request #12276 from grafana/davkal/expose-react-slate
Expose react and slate to external plugins
2018-06-14 14:41:30 +02:00
Tobias Skarhed 23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
David Kaltschmidt 5ec7d60e5f Removed papaparse from external plugin exports 2018-06-14 13:22:16 +01:00
Tobias Skarhed ef0586acab Karma to Jest: query_builder 2018-06-14 14:20:42 +02:00
Marcus Efraimsson 284045748c Merge pull request #12243 from grafana/12236-ds-proxy-tokens
dsproxy: allow multiple access tokens per datasource
2018-06-14 14:03:08 +02:00
Marcus Efraimsson 99c188f626 Merge pull request #12273 from grafana/12247-link-icon
fix panel link icon positioning
2018-06-14 13:54:08 +02:00
Daniel Lee 10d30f0b73 dsproxy: move http client variable back
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
2018-06-14 13:39:46 +02:00
Tobias Skarhed 283b39c397 Karma to Jest: threshold_mapper 2018-06-14 13:38:03 +02:00
David Kaltschmidt eb686c06f2 Expose react and slate to external plugins
Experimental support for react in external plugins

- react
- slate (editor)
- papaparse (csv parsing)
- prismjs (syntax highlighting)

This is needed for new external datasource plugins like Flux
2018-06-14 12:32:57 +01:00
Tobias Skarhed 155ff06cbe Karma to Jest: threshold_manager 2018-06-14 13:22:17 +02:00
Tobias Skarhed 2465f53324 Karma to Jest: query_def, index_pattern 2018-06-14 12:18:11 +02:00
Tobias Skarhed a911d36dea Remove import 2018-06-14 12:00:54 +02:00
Tobias Skarhed 04029a94cd Karma to Jest: elastic_response 2018-06-14 11:56:03 +02:00
Marcus Efraimsson 71b0326769 Merge pull request #12237 from dehrax/12224-version-panel
Convert tests from Karma to Jest
2018-06-14 10:13:46 +02:00
Patrick O'Carroll 8345e83bd6 changelog: notes about closing #12189 2018-06-14 10:05:11 +02:00
Anton Sergeyev 2565a8087c #11607 corrected file cleanup test 2018-06-14 13:00:07 +05:00
Patrick O'Carroll 9802d86783 Merge pull request #12189 from ryantxu/focus-panel-search
autoFocus the add-panel search filter, and add on enter
2018-06-14 09:54:41 +02:00
Anton Sergeyev 7818578d6a #11607 removed unnecessary conversion (from gometalinter) 2018-06-14 12:50:18 +05:00
Tobias Skarhed a3552a60e1 Improve test readability 2018-06-14 09:46:36 +02:00
Anton Sergeyev 2024cf4b56 #11607 fixed formatting 2018-06-14 12:46:29 +05:00
Anton Sergeyev 516839d7b2 #11607 Cleanup time of temporary files is now configurable 2018-06-14 12:35:22 +05:00
Patrick O'Carroll a0aa0b55e7 moved link icon in panel header 2018-06-14 09:24:51 +02:00
Tobias Skarhed 4dd9b8f324 Karma to Jest: playlist_edit_ctrl 2018-06-13 16:29:50 +02:00
Tobias Skarhed 94b8cbdc6a Karma to Jest: exporter 2018-06-13 15:15:36 +02:00
nikoalch 0cc8ccdaa5 Update graphite.md 2018-06-13 08:40:15 -04:00
Marcus Efraimsson ff3db60e2e changelog: add notes about closing #10796
[skip ci]
2018-06-13 13:13:57 +02:00
Marcus Efraimsson 2288e01752 Merge pull request #12169 from alexanderzobnin/feat-10796
Import dashboard to folder
2018-06-13 13:10:52 +02:00
Marcus Efraimsson c39979a557 Merge pull request #12255 from dehrax/docs-dev-grafana
Update "Building from source" docs
2018-06-13 12:46:45 +02:00
André Niemann 23c97d080f added id tag to Panels for html bookmarking on longer Dashboards 2018-06-13 10:07:47 +02:00
Alexander Zobnin 25504e84ed dashboard import to folder: minor fixes 2018-06-13 10:44:37 +03:00
Tobias Skarhed c650b50c37 Docs: output location from build script 2018-06-13 09:37:14 +02:00
Carl Bergquist d3a3e7cfd1 Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references
removed QueryOptionsCtrl references
2018-06-13 09:34:02 +02:00
Marcus Efraimsson 3b824a5e00 Merge pull request #12244 from kdombeck/patch-1
docs: correct provisioning link
2018-06-13 09:14:32 +02:00
Ken Dombeck 110522307a Correct Provisioning documentation link
It was pointing to Prometheus documentation instead.
2018-06-12 09:01:25 -07:00
Daniel Lee 719ebdc24d dsproxy: allow multiple access tokens per datasource
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
2018-06-12 17:39:38 +02:00
Daniel Lee 610a90b79a Merge pull request #12231 from dehrax/12224-graph-tooltip
Karma to Jest: graph-tooltip
2018-06-12 16:32:14 +02:00
Tobias Skarhed 72ecf72c45 Mock core in jest-setup 2018-06-12 16:14:22 +02:00
Tobias Skarhed 8155ce9804 Docs: Update Build from Source 2018-06-12 15:06:17 +02:00
Tobias Skarhed d91e9ddd22 Convert tests from Karma to Jest 2018-06-12 13:54:07 +02:00
Marcus Efraimsson d8f269954a changelog: add notes about closing #11963
[skip ci]
2018-06-12 13:10:48 +02:00
Patrick O'Carroll 0bb30b146c save-modal save button (#12047)
Disable save dashboard button when saving
2018-06-12 11:54:50 +02:00
Tobias Skarhed da9a28f37d Karma to Jest: graph-tooltip 2018-06-11 15:59:20 +02:00
Jiang Ye c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
bergquist dbaa45e51e update latest.json to 5.1.3 2018-06-09 21:26:07 +02:00
ryan 0a3ec93347 use ng-if 2018-06-08 15:49:30 +02:00
David Kaltschmidt ab76864e61 hot-fix ifql testdatasource() 2018-06-08 14:56:48 +02:00
Carl Bergquist 5ed2880a8b Merge pull request #12202 from grafana/11486_sqlite
Upgrade mattn/go-sqlite3 to v1.7.0
2018-06-08 13:11:46 +02:00
Carl Bergquist 38864d74bd Merge pull request #12180 from grafana/deploy
Propagate specific git-sha into tarball and docker builds
2018-06-08 13:02:07 +02:00
bergquist 484d9e3f9d triggers grafana-docker master build 2018-06-08 12:44:01 +02:00
Patrick O'Carroll 77403b0dc1 changed som variables to values so it's the same for dark and light theme, added special styling for login text, link and input (#12196) 2018-06-07 11:03:58 -07:00
Marcus Efraimsson c0830e9cde mattn/go-sqlite3 v1.6.0 to v1.7.0 2018-06-07 16:53:39 +02:00
Marcus Efraimsson 7d508df1b4 changelog: add notes about closing #11074
[skip ci]
2018-06-07 16:24:45 +02:00
Patrick O'Carroll 25f2960717 fixed so panel title doesn't wrap and (#12142)
dashboard: fix so panel titles doesn't wrap
2018-06-07 16:20:55 +02:00
Alexander Zobnin 24f6d34abd graph: fix legend decimals precision calculation 2018-06-07 16:02:44 +03:00
Ryan McKinley 1f32871f70 Use Passive eventListener for 'wheel' (#12106)
* make wheel passive

* remove console
2018-06-07 03:41:50 -07:00
Marcus Efraimsson 3fb4eb7322 Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting
Respect explore settings in config ini
2018-06-07 12:08:42 +02:00
ryan 09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
2018-06-07 10:31:46 +02:00
David 82ae7c6eee Merge pull request #12167 from grafana/davkal/ifql-helpers
Query helpers, Annotations, and Template Variables for IFQL datasource
2018-06-07 10:24:21 +02:00
bergquist 4a8e9cf93f removes more unused code 2018-06-07 07:15:50 +02:00
bergquist 850aa21d45 removes unused code 2018-06-07 07:06:13 +02:00
Ryan McKinley 17a2ce13f0 nicer collapsed row behaviour (#12186)
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
2018-06-06 21:58:42 -07:00
Ryan McKinley 415ad8fbf3 remove DashboardRowCtrl (#12187) 2018-06-06 21:57:30 -07:00
ryan c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan 37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
bergquist f93d83befe adds missing return statement 2018-06-06 22:17:19 +02:00
Sławek Piotrowski 9db964bf35 Fix typo: eleasticsearch -> elasticsearch (#12184) 2018-06-06 13:09:16 -07:00
David Kaltschmidt cdba2bd184 Annotations support for ifql datasource 2018-06-06 16:11:40 +02:00
Alexander Zobnin 8fd3015e52 dashboard: improve import UX for non-editor users
validate folderId, import only into available folders
2018-06-06 15:35:19 +03:00
David Kaltschmidt 2c86484e54 Template variable support for ifql datasource
* Implements findMetricQuery()
* Macros for template queries: measurements(), tags(), tag_values(),
 field_keys()
* Tests for macro expansion
2018-06-06 14:11:48 +02:00
Tom Wilkie c47f40d99c Use cut to trim down the SHA1.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2018-06-06 12:07:47 +01:00
Alexander Zobnin 9460063ab5 show import menu in sidenav, dashboard search and manage dashboards page
if user has editor permissions for at least one folder
2018-06-06 13:55:00 +03:00
David Kaltschmidt 3bd58446d6 Fix metrics panel test by adding config mock 2018-06-06 11:15:24 +02:00
David Kaltschmidt 661503f828 Respect explore settings in config ini
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
2018-06-06 10:50:47 +02:00
David Kaltschmidt 56fc82151b Add .html to webpack.hot resolve extensions 2018-06-06 09:12:06 +02:00
Sven Klemm a05d694d31 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-05 23:21:46 +02:00
Tom Wilkie 681326140d Version the tarball uploaded to s3 and tell the next step about it.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2018-06-05 20:02:51 +01:00
Alexander Zobnin 4ff4ac1d5f dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00
Alexander Zobnin 393f41cd14 dashboard: add Import button to manage page 2018-06-05 19:37:47 +03:00
Alexander Zobnin 4063ae37a4 dashboard: import to folder 2018-06-05 19:23:09 +03:00
David Kaltschmidt d7379912c1 Query helpers for IFQL datasource
* raw CSV preview next to query field (query inspector is not that
 useful here)
* added result table and record counts
2018-06-05 17:15:35 +02:00
bergquist 171a38df99 alerting: fixes broken table rename 2018-06-05 14:29:48 +02:00
David 45a156577c Merge pull request #12143 from grafana/davkal/ifql-datasource
InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
Leonard Gram 9e7651a1b3 docs: docker secrets available in v5.2.0 2018-06-05 13:54:23 +02:00
David Kaltschmidt 64f5874778 Remove round-robin urls in ifql DS 2018-06-05 13:49:35 +02:00
David Kaltschmidt 1d587450b3 IFQL range variable expansion 2018-06-05 13:42:32 +02:00
bergquist ab70ead5e4 alerting: renames journal table to alert_notification_journal 2018-06-05 13:10:38 +02:00
bergquist bcbae7aa62 alerting: move queries from evalcontext to notifier base 2018-06-05 12:07:02 +02:00
Carl Bergquist 05245e9b3d Merge pull request #12161 from bergquist/alerting_reminder_invert
alerting: invert sendOnce to sendReminder
2018-06-05 11:03:37 +02:00
Leonard Gram eb66266629 changelog: release v5.2.0-beta1. 2018-06-05 10:57:18 +02:00
bergquist 7333d7b8d4 alerting: invert sendOnce to sendReminder 2018-06-05 10:44:17 +02:00
Marcus Efraimsson cb9fc3f6b4 changelog: add notes about closing #11657
[skip ci]
2018-06-05 09:35:24 +02:00
bergquist 0c6d8398a1 alerting: remove zero units from duration 2018-06-05 08:42:39 +02:00
Carl Bergquist 6d27c3d0c5 Merge pull request #12154 from grafana/11657_server_admin
Always show server admin link in sidenav if grafana admin
2018-06-05 08:02:05 +02:00
bergquist 93124f38fa alerting: only check frequency when not send once 2018-06-04 22:19:27 +02:00
Marcus Efraimsson 962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
Marcus Efraimsson d09749eaaa Merge pull request #12153 from grafana/googleOAuthDocs
update google auth config docs
2018-06-04 18:50:28 +02:00
Dan Cech 9b29a19609 update google auth config docs 2018-06-04 12:32:35 -04:00
Marcus Efraimsson 58406707f9 changelog: add notes about closing #11525
[skip ci]
2018-06-04 18:10:28 +02:00
Marcus Efraimsson 38c94bb633 Merge pull request #12117 from grafana/11525-dashlist-folder-picker
Fix search by folder in dashboard list panel
2018-06-04 18:08:38 +02:00
Torkel Ödegaard 9e59751c07 fix: fixed problem with expanding access mode help in ds settings 2018-06-04 18:05:16 +02:00
Torkel Ödegaard ae82112c2e dep: use master branch for plugin model 2018-06-04 17:47:38 +02:00
bergquist 0e647db485 Merge branch 'master' into alerting_reminder
* master: (30 commits)
  changelog: add notes about closing #11882
  renamed variable in tests
  added comment, variableChange -> variableValueChange
  added a test
  added if to check if new variable has been added
  Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
  change admin password after first login
  changelog: adds note about closing #11958
  revert: reverted singlestat panel position change PR #12004
  Revert "provisioning: turn relative symlinked path into absolut paths"
  provisioning: turn relative symlinked path into absolut paths
  changelog: adds note about closing #11670
  elasticsearch: sort bucket keys to fix issue wth response parser tests
  docs: what's new in v5.2
  changelog: add notes about closing #11167
  docs: docker secrets support. (#12141)
  alerting: show alerts for user with Viewer role
  datasource: added option no-direct-access to ds-http-settings diretive, closes #12138
  provisioning: adds fallback if evalsymlink/abs fails
  tests: uses different paths depending on os
  ...
2018-06-04 17:44:18 +02:00
bergquist 86e65f84f9 alerting: fixes invalid error handling 2018-06-04 17:30:57 +02:00
David 95aef8241c Merge pull request #12146 from grafana/12144-new-variable-save
added if to check if new variable has been added
2018-06-04 17:26:48 +02:00
Patrick O'Carroll d650dc94c9 fixed so default is all and general only show dashboards 2018-06-04 17:25:20 +02:00
Marcus Efraimsson 09a0a49c52 changelog: add notes about closing #11882
[skip ci]
2018-06-04 16:32:42 +02:00
Patrick O'Carroll 937b26f3fd added s to folderId in params 2018-06-04 16:28:24 +02:00
Patrick O'Carroll 89238b4a04 renamed variable in tests 2018-06-04 16:23:36 +02:00
Patrick O'Carroll b122f53085 added comment, variableChange -> variableValueChange 2018-06-04 16:23:36 +02:00
Patrick O'Carroll 609b0fa498 added a test 2018-06-04 16:23:36 +02:00
Patrick O'Carroll 5e484e8393 added if to check if new variable has been added 2018-06-04 16:23:36 +02:00
Marcus Efraimsson 6281910591 Merge pull request #12037 from grafana/login-change-password
change admin password after first login
2018-06-04 16:21:45 +02:00
pari- 9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
Closes #12148
2018-06-04 16:03:59 +02:00
David b5c53aae97 Merge pull request #12108 from grafana/davkal/12001-explore-permissions
Restrict Explore UI to Editor and Admin roles
2018-06-04 16:01:39 +02:00
Patrick O'Carroll cb6c6c8172 change admin password after first login 2018-06-04 16:01:09 +02:00
bergquist 574e92e1d8 changelog: adds note about closing #11958
[skip ci]
2018-06-04 16:00:44 +02:00
Carl Bergquist 7214ee9024 Merge pull request #12007 from bergquist/provisioning_symlinked_folders
Add support for symlinked folders in dashboard provisioning
2018-06-04 16:00:32 +02:00
Torkel Ödegaard 829af9425f revert: reverted singlestat panel position change PR #12004 2018-06-04 15:45:29 +02:00
bergquist cd4026da6b Revert "provisioning: turn relative symlinked path into absolut paths"
This reverts commit d089b5e05d.
2018-06-04 15:38:37 +02:00
bergquist d089b5e05d provisioning: turn relative symlinked path into absolut paths 2018-06-04 15:20:26 +02:00
Marcus Efraimsson 33ee1fba30 Merge pull request #12150 from grafana/12120_whats_new
Draft: What's new in v5.2
2018-06-04 15:17:31 +02:00
bergquist c138ff2c90 changelog: adds note about closing #11670 2018-06-04 15:16:34 +02:00
Marcus Efraimsson 38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Carl Bergquist 49d9235433 Merge pull request #12122 from grafana/provisioning_ha
Support provisioning in HA setup where modtime differs
2018-06-04 15:12:46 +02:00
Marcus Efraimsson 0d5579b4c0 docs: what's new in v5.2 2018-06-04 14:31:43 +02:00
Patrick O'Carroll 8419cc0553 made folder text smaller 2018-06-04 13:32:19 +02:00
John Baublitz bdf433594a Implement code review changes 2018-06-04 13:19:14 +02:00
John Baublitz 5c5951bc42 Bug fix for repeated alerting even on OK state and add notification_journal cleanup when alert resolves 2018-06-04 13:19:14 +02:00
John Baublitz c0a9e5cf1d Fix tests 2018-06-04 13:19:14 +02:00
John Baublitz fca97535d1 Fix multiple bugs 2018-06-04 13:19:14 +02:00
John Baublitz 3cb0e27e1c Revert changes post code review and move them to notification page 2018-06-04 13:19:14 +02:00
John Baublitz e068be4c26 Feature for repeated alerting in grafana 2018-06-04 13:19:13 +02:00
David Kaltschmidt 08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Marcus Efraimsson 7453df2662 changelog: add notes about closing #11167
[skip ci]
2018-06-04 11:57:13 +02:00
Marcus Efraimsson e258f30704 Merge pull request #12129 from alexanderzobnin/fix-11167
alert list panel: show alerts for user with viewer role
2018-06-04 11:54:51 +02:00
Leonard Gram e562ae753b docs: docker secrets support. (#12141)
Closes #12132
2018-06-04 11:49:12 +02:00
Alexander Zobnin 13c6f37ea5 alerting: show alerts for user with Viewer role
changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
2018-06-04 12:34:30 +03:00
Torkel Ödegaard feb5e20779 datasource: added option no-direct-access to ds-http-settings diretive, closes #12138 2018-06-04 11:17:50 +02:00
bergquist f606654c50 provisioning: adds fallback if evalsymlink/abs fails 2018-06-04 09:04:33 +02:00
bergquist 3f5078339c tests: uses different paths depending on os 2018-06-04 08:27:03 +02:00
bergquist 75ee1e9208 renames intervalSeconds to updateIntervalSeconds 2018-06-04 08:13:20 +02:00
Sven Klemm 6220dec076 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-02 12:57:14 +02:00
Marcus Efraimsson f5cf926364 changelog: add notes about closing #5893
[skip ci]
2018-06-01 15:23:26 +02:00
Marcus Efraimsson b6afe5f2e8 Merge pull request #11380 from WPH95/feature/add_es_alerting
elasticsearch: alerting support
2018-06-01 15:17:28 +02:00
Patrick O'Carroll 83a73327cf removed italic 2018-06-01 15:16:22 +02:00
Marcus Efraimsson b67872bc35 changelog: add notes about closing #11500, #8168, #6541
[skip ci]
2018-06-01 14:49:14 +02:00
Patrick O'Carroll 0c269d64d0 Alert panel filters (#11712)
alert list panel: filter alerts by name, dashboard, folder, tags
2018-06-01 14:36:40 +02:00
Marcus Efraimsson ce75afa413 docs: update alerting docs with alerting support for elasticsearch 2018-06-01 12:26:20 +02:00
Patrick O'Carroll 18e4271abd added span with folder title that is shown for recently and starred, created a new class for folder title 2018-06-01 10:34:57 +02:00
David 13a9701581 Update CHANGELOG.md
- added Prometheus query date alignment
2018-06-01 10:13:48 +02:00
bergquist 333af6fd9b provisioning: makes the interval for polling for changes configurable 2018-05-31 21:07:34 +02:00
bergquist c817aecd66 provisioning: only update dashboard if hash of json changed 2018-05-31 21:05:52 +02:00
Marcus Efraimsson b8ff3b1e3f remove dead code 2018-05-31 19:05:32 +02:00
Marcus Efraimsson dcac63936b elasticsearch: minor refactor
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
2018-05-31 19:02:20 +02:00
Marcus Efraimsson 28f0acd854 Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
Marcus Efraimsson a2cd05f6db changelog: update
[skip ci]
2018-05-31 16:31:53 +02:00
Marcus Efraimsson 67410f7a4d changelog: add notes about closing #10748, #8805
[skip ci]
2018-05-31 15:48:19 +02:00
Patrick O'Carroll 37f9bdfc8c save modal ux improvements (#11822)
changes to save modal when saving an updated dashboard

Changed time range and variables are now not saved by default, 
you'll need to actively choose if you want to save updated time 
range and or variables.
2018-05-31 15:40:57 +02:00
Marcus Efraimsson 938deae4b4 changelog: add notes about closing #11515
[skip ci]
2018-05-31 15:24:01 +02:00
Marcus Efraimsson a1b20bf69a Merge pull request #12092 from grafana/11515_import_uid
Validate uid when importing dashboards
2018-05-31 15:18:24 +02:00
bergquist 44f5b92fbc provisioning: only provision if json file is newer then db 2018-05-31 11:38:29 +02:00
David Kaltschmidt 0c45ee63a9 Guard /explore by editor role on the backend 2018-05-31 11:26:24 +02:00
bergquist 2bd4c14e5f make path absolute before following symlink 2018-05-31 09:53:15 +02:00
bergquist 47d3884377 provisioning: follow symlinked folders
fixes #11958
2018-05-31 09:38:09 +02:00
bergquist d5aeae3a90 test: fixes broken test on windows 2018-05-31 08:27:29 +02:00
Carl Bergquist 5c30643f6e Merge pull request #12101 from bergquist/devenv
devenv: initial scripts for setting up devenv
2018-05-30 21:49:17 +02:00
Marcus Efraimsson 82ba27b5f2 changelog: add notes about closing #11771
[skip ci]
2018-05-30 21:31:31 +02:00
Marcus Efraimsson d2296d332e Merge pull request #12107 from grafana/davkal/11771-hide-gridcontrols
Fix CSS to hide grid controls in fullscreen/low-activity views
2018-05-30 21:29:24 +02:00
Marcus Efraimsson a4b1dd036d changelog: add notes about closing #11971
[skip ci]
2018-05-30 18:11:47 +02:00
Patrick O'Carroll b894b5e669 Fix singlestat threshold tooltip (#12109)
fix singlestat threshold tooltip
2018-05-30 18:09:57 +02:00
Leonard Gram b379b28337 build: only runs db related tests on db. 2018-05-30 16:27:47 +02:00
Leonard Gram e33b17fac6 build: integration testing postegres on ci. 2018-05-30 16:27:47 +02:00
Leonard Gram 50d1519a91 build: mysql integration testing on ci. 2018-05-30 16:27:47 +02:00
David Kaltschmidt 827fb7e8de Fix karma tests that rely on MetricsPanelCtrl 2018-05-30 15:24:47 +02:00
Leonard Gram 21ecaae6ff changelog: Second epochs are now correctly converted to ms. 2018-05-30 14:30:01 +02:00
David Kaltschmidt 7224ca6c62 Fix panel menu test 2018-05-30 13:24:09 +02:00
David Kaltschmidt f69654fcd5 Restrict Explore UI to Editor and Admin roles
Access is restricted via not showing in the following places:

* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`

Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
2018-05-30 13:13:29 +02:00
David 7a3c1e162c Merge pull request #11942 from grafana/davkal/design-integration
Explore: Time selector, split view, design integration
2018-05-30 12:27:24 +02:00
David Kaltschmidt ac1dda3b3a Fix CSS to hide grid controls in fullscreen/low-activity views
* there was a comma missing to hide the handles, fixed now
* added new styles to hide header interaction in full screen panels
2018-05-30 12:07:51 +02:00
David 40844614bf Merge pull request #12096 from grafana/davkal/11446-fix-systemjs-cachebust
Fix cache busting for systemjs imports for plugins
2018-05-30 10:05:46 +02:00
Marcus Efraimsson f2942d94a5 changelog: add notes about closing #11645
[skip ci]
2018-05-30 09:26:15 +02:00
Kim Christensen 48fc5edda1 Support InfluxDB count distinct aggregation (#11658)
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
bergquist c7acbcdaf5 provisioning: enable relative path's
this commit enable relatives path for provisioning dashboards.
this enables easier dev setups
2018-05-30 08:46:44 +02:00
bergquist f32e3a2960 changelog: note about closing #11858 2018-05-29 17:22:52 +02:00
Carl Bergquist 813a9a975f Merge pull request #12090 from grafana/11858_create_dashboard_link
Show create dashboard link if at least editor in one folder
2018-05-29 17:18:41 +02:00
bergquist b253284acc devenv: improve readme 2018-05-29 16:52:02 +02:00
bergquist 1411709db1 provisioning: place testfiles within testdata folder 2018-05-29 16:30:12 +02:00
David 9b9e3962c5 Merge pull request #12072 from grafana/davkal/12024-fix-alignment
Changed Prometheus interval-alignment to cover whole panel range
2018-05-29 15:03:06 +02:00
Marcus Efraimsson 048ac3089b Merge branch 'master' into feature/add_es_alerting 2018-05-29 14:36:52 +02:00
Marcus Efraimsson 79575ea124 changelog: add notes about closing #11494
[skip ci]
2018-05-29 14:29:00 +02:00
Christophe Le Guern 3ba3fd9a59 Add new regions to handleGetRegions function (#12082)
As public/app/plugins/datasource/cloudwatch/partials/config.html and this file differ between the AWS regions available, I've updated the latest so they share the same data.
In that way, the regions() method in dashboards returns the same list as the frontend does.
2018-05-29 14:26:33 +02:00
Torkel Ödegaard 6e145ad32d Merge branch 'master' of github.com:grafana/grafana 2018-05-29 14:11:36 +02:00
Torkel Ödegaard 4c9b146bda PR: minor change to PR #12004 before merge 2018-05-29 14:11:05 +02:00
Marcus Efraimsson 2c8571a686 Merge pull request #12089 from bergquist/graphite_header
graphite: avoid distributed tracing headers in direct/browser mode
2018-05-29 14:07:18 +02:00
Torkel Ödegaard 249e682511 Merge branch 'master' of https://github.com/mammuthus/grafana 2018-05-29 14:04:54 +02:00
Torkel Ödegaard be34417b3a fix: refactoring PR #11996 and fixing issue #11551 16706hashkey in json editors 2018-05-29 14:02:52 +02:00
bergquist a1e6c31ec1 devenv: script for setting up default datasources 2018-05-29 14:00:46 +02:00
Torkel Ödegaard 634a26d2eb Merge branch 'remove_hash' of https://github.com/eMerzh/grafana 2018-05-29 13:25:44 +02:00
Torkel Ödegaard ddd5e5ae70 tech: updated react-grid-layout to latest official release, closes #12100 2018-05-29 13:23:07 +02:00
David c67d72db63 Merge pull request #12041 from grafana/davkal/11931-table-docs
Document table row merge for multiple queries
2018-05-29 12:08:55 +02:00
David Kaltschmidt 8bcd55d221 Fix cache busting for systemjs imports for plugins
* everything imported via systemjs in the path `plugin/` will get a
 timestamp appended for cache busting
* timestamp is set once on page load
* plugin css loader gets cache buster too
2018-05-29 12:01:10 +02:00
bergquist 6a82098ddf devenv: scripts for generating many unique dashboards 2018-05-29 11:52:00 +02:00
Marcus Efraimsson e80f54c243 Merge pull request #12094 from grafana/elastic6-docker
docker: new block for elasticsearch6
2018-05-29 11:22:42 +02:00
Daniel Lee fb41048dd7 docker: new block for elasticsearch6 2018-05-29 11:04:16 +02:00
Marcus Efraimsson 2d5ec9b9e4 changelog: add notes about closing #12087
[skip ci]
2018-05-29 10:50:13 +02:00
Marcus Efraimsson 1bc94c7d5a Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured
inviting users: show friendlier error message when smtp is not configured
2018-05-29 10:46:46 +02:00
Leonard Gram e6f2811b21 sql: seconds epochs are now correctly converted to ms.
Closes #12061
2018-05-29 08:44:03 +02:00
Marcus Efraimsson 7c3e8afd82 add validation of uid when importing dashboards 2018-05-28 22:34:40 +02:00
Brice Maron 01f80950de fix: add track by name in annotation list to avoid $$hashKey in json 2018-05-28 21:11:32 +02:00
bergquist 83b7bbd60b changelog: adds note about closing #9703 2018-05-28 20:55:11 +02:00
bergquist add791b2cc Merge branch '9703-auth-proxy'
* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
2018-05-28 20:49:40 +02:00
bergquist d7b5fb4604 go fmt fixes 2018-05-28 20:48:01 +02:00
iyeonok bafe25fbd9 configure proxy environments for Transport property
related issue: https://github.com/grafana/grafana/issues/9703
2018-05-28 20:48:01 +02:00
Marcus Efraimsson 7548d6f6d1 Show create dashboard link if at least editor in one folder 2018-05-28 20:37:39 +02:00
bergquist e708e9ac3c graphite: avoid dtracing headers in direct mode
closes #11494
2018-05-28 20:35:19 +02:00
David Kaltschmidt 6d8d6cdb57 Fix sourcemaps for webpack hot config 2018-05-28 20:32:33 +02:00
thurt b487aa3e6a return better error message when err is ErrSmtpNotEnabled
fixes #12087
2018-05-28 17:49:31 +00:00
Marcus Efraimsson 7cb0403faa elasticsearch: handle if alert query contains template variable
If datasource handles targetContainsTemplate function it can evaluate if a certain
query contains template variables and this is used for show an error message that
template variables not is supported in alert queries.
2018-05-28 19:45:18 +02:00
Marcus Efraimsson e5e1683840 Merge branch 'master' into feature/add_es_alerting 2018-05-28 18:10:34 +02:00
bergquist 8d400b8f7b changelog: adds note about closing #9847 2018-05-28 17:50:36 +02:00
Ryan McKinley 17b9609209 Sparklines should scale to the data range (#12010)
* Add a full range option to sparklines

* line zero=false
2018-05-28 16:30:44 +02:00
Torkel Ödegaard 7b09dfe9a0 Merge branch 'davkal/split-webpack-config-hot' 2018-05-28 14:18:35 +02:00
David Kaltschmidt ebe8e62bd5 Split webpack dev config into dev and hot
Motivation:

* too many conditionals for config, better to be explicit
* different priorities: faster build for hot mode
* working SCSS sources for styles in hot mode

The biggest differences:

* removed linter from TS loader in hot (should be editor or precommit
 or responsibility)
* simplified styles loading
* hot needs more extensions to resolve
* removed commons chunking for hot
* removed devServer from dev

Reduced HMR time from 8s to 4s on my machine.
2018-05-28 13:49:15 +02:00
David ced8c5f0e4 Upgrade webpack loaders (#12081)
* upgrade all webpack loaders to recent version
* keep TS loader at 4.0.0 (5.0.0 requires webpack 4)
* remove unused json-loader
2018-05-28 13:46:57 +02:00
Marcus Efraimsson 5a96863eed pin versions of xorm to resolve sql tests
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
2018-05-28 13:07:41 +02:00
Carl Bergquist 519e58a267 Merge pull request #12071 from grafana/12056_usage_stats
Additional anonymous usage stats
2018-05-28 11:23:16 +02:00
bergquist a2ed0b15da build: fixes broken path for bra run
removes os and arch from binary path
when building in dev mode
2018-05-28 10:39:42 +02:00
Marcus Efraimsson c9e9f25699 use sql builder for the get system stats sql query 2018-05-28 10:37:17 +02:00
Carl Bergquist 6c259eb04d Merge pull request #12077 from roidelapluie/logout
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
2018-05-28 08:06:00 +02:00
Mitsuhiro Tanda e65cf5cbb5 fix directly specified variable rendering 2018-05-28 11:28:08 +09:00
Daniel Lee de295af231 Merge pull request #12003 from mageo/master
Added Swiss franc currency
2018-05-28 01:13:21 +02:00
Sven Klemm 17b46804e8 remove unused function renderAdhocFilters 2018-05-27 19:39:43 +02:00
Sven Klemm d77f9b2e74 send param in callback for get-param-options 2018-05-27 17:25:20 +02:00
Julien Pivotto a5e6cb9a02 Fix #9847 Add a generic signout_redirect_url to enable oauth logout
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-05-27 14:52:50 +02:00
Sven Klemm 039e38d510 make separator configurable 2018-05-26 23:03:59 +02:00
Sven Klemm 291d732b36 fix error message 2018-05-26 20:53:01 +02:00
Sven Klemm 928353c628 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-26 13:37:00 +02:00
David Kaltschmidt 750ea9bbdd Changed Prometheus interval-alignment to cover whole panel range
* the existing query date alignment shifts the range forward to match
a multiple epoch of the interval, but keeps the range length the same,
the result is that the start date is shifted forward as well, leaving a
gap in the graph (or a zero-line when null-as-zero was set, issue #12024)
* this pr extends the aligned range to cover the original start date as
well
2018-05-25 16:46:38 +02:00
bergquist 238139fad6 alerting: refactor tests 2018-05-25 16:12:34 +02:00
Marcus Efraimsson fbc44025dc add usage stats for datasource access mode 2018-05-25 16:06:35 +02:00
David Kaltschmidt 27e7a28b37 Review feedback (heading, typos)
* iff and therefor
* mention merge in heading
* add note about checking query inspector
2018-05-25 14:47:46 +02:00
Marcus Efraimsson 2ea5b6fe33 add additional usage stats metrics
nr of folders
nr of folder permissions
nr of dashboard permissions
nr of snapshots
nr of teams
nr of provisioned dashboards
2018-05-25 14:33:37 +02:00
Marcus Efraimsson a6a12d36d7 add tests for sending usage stats 2018-05-25 13:32:55 +02:00
David Kaltschmidt 448b1cbc15 Integrated dark theme for explore UI 2018-05-25 12:51:27 +02:00
Marcus Efraimsson 4752d7884a elasticsearch: adds some more/better debug logging to client 2018-05-25 10:31:56 +02:00
bergquist 21ade3f64f changelog: fix broken link to contributor 2018-05-25 10:14:13 +02:00
bergquist 94ee9c63a8 changelog: adds note about closing #11788 2018-05-25 07:41:15 +02:00
balyn fac0333f47 The old code for centering removed
Old code removed
2018-05-24 19:35:04 +03:00
Torkel Ödegaard 80d694d205 Backend image rendering as plugin (#11966)
* rendering: headless chrome progress

* renderer: minor change

* grpc: version hell

* updated grpc libs

* wip: minor progess

* rendering: new image rendering plugin is starting to work

* feat: now phantomjs works as well and updated alerting to use new rendering service

* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)

* rendering: now render key is passed and render auth is working in plugin mode

* removed unneeded lines from gitignore

* rendering: now plugin mode supports waiting for all panels to complete rendering

* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases

* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values

* fix: another update to tz param generation

* renderer: added http mode to renderer service, new ini setting [rendering] server_url
2018-05-24 15:26:27 +02:00
Carl Bergquist ca7bbc44c0 Merge pull request #12050 from aarongarciah/patch-1
Fix typo in README.md
2018-05-24 15:18:56 +02:00
Aarón García Hervás 4c5e1cacfe Fix typo in README.md 2018-05-24 12:39:11 +02:00
Leonard Gram f80810081b build: updates publisher to support arm archs for deb and rpm. 2018-05-24 11:12:10 +02:00
David Kaltschmidt f5e351af8b Explore split view
* button to bring a up a duplicate explore area to compare
* side by side rendering of two explore components
* right component has close button
* left component has page title
2018-05-24 10:55:01 +02:00
David Kaltschmidt 23c9da6162 Fixed custom dates for react timepicker
* added jest tests for timepicker component
2018-05-24 10:55:01 +02:00
David Kaltschmidt eadaff6191 Explore: Design integration
* style header like other grafana components
* use panel container for graph and same styles for query field
* fix typeahead CSS selector (was created outside of .explore)
* use navbar buttons for +/- of rows
* moved elapsed time under run query button
* fix JS error on multiple timeseries being returned
* fix color for graph lines
* show prometheus query errors
2018-05-24 10:55:00 +02:00
David Kaltschmidt 0d3f24ce54 Explore: time selector
* time selector for explore section
* mostly ported the angular time selector, but left out the timepicker
 (3rd-party angular component)
* can be initialised via url parameters (jump from panels to explore)
* refreshing not implemented for now
* moved the forward/backward nav buttons around the time selector
2018-05-24 10:55:00 +02:00
Leonard Gram 7a30f72902 Merge pull request #12046 from fg2it/package
fix names of foreign arch packages
2018-05-24 09:34:15 +02:00
Dan Cech 417db13efb Fix dashboard snapshot deletion (#12025)
* fix issue deleting dashboard snapshots by deleteKey, add dedicated endopoint for authenticated requests, update frontend, tests & docs.
2018-05-24 08:55:16 +02:00
fg2it 22638db532 fix names of foreign arch packages 2018-05-23 23:53:59 +02:00
Marcus Efraimsson 16c3566a87 elasticsearch: handle NaN values 2018-05-23 22:57:46 +02:00
Marcus Efraimsson 688f5b830c elasticsearch: metric and pipeline agg setting json encoding fix 2018-05-23 22:21:41 +02:00
Marcus Efraimsson 4436b8da12 elasticsearch: query interval override fix 2018-05-23 22:07:52 +02:00
Marcus Efraimsson 8870e3e85b elasticsearch: default interval fix
5s instead of 15s
2018-05-23 21:44:09 +02:00
Marcus Efraimsson ed110bc312 Merge pull request #11967 from grafana/migrate-jquery-lodash-extended-to-ts
chore: migrate files to ts
2018-05-23 17:58:37 +02:00
David Kaltschmidt 61b296afad Document table row merge for multiple queries
* added section to table feature docs
* marked as 5.0+ feature
* concrete examples of what works and the limits
2018-05-23 17:08:54 +02:00
Leonard Gram 0bfbb1c161 Merge pull request #11920 from grafana/crosscompile
Crosscompile and packages Grafana on arm, windows, linux and darwin
2018-05-23 17:03:25 +02:00
Marcus Efraimsson 242689abe2 elasticsearch: pipeline aggregation fix for json encoding 2018-05-23 16:46:26 +02:00
Leonard Gram bea4741a12 build: always build for all platforms. 2018-05-23 16:03:21 +02:00
Marcus Efraimsson dce59ccff2 fix: remove deadcode to make gometalinter happy 2018-05-23 15:28:36 +02:00
Marcus Efraimsson 4840adff00 elasticsearch: refactor query handling and use new es simple client
Removes moment dependency.
Adds response parser tests (based on frontend tests).
Adds time series query tests (based on frontend tests).
Fixes various issues related to response parsing and building search request queries.
Added support for extended stats metrics and geo hash grid aggregations.
2018-05-23 15:09:58 +02:00
Marcus Efraimsson e171ed8910 elasticsearch: new simple client for communicating with elasticsearch
Handles minor differences of es 2, 5 and 5.6.
Implements index pattern logic.
Exposes builders for building search requests.
2018-05-23 14:59:12 +02:00
Marcus Efraimsson 77400cef08 elasticsearch: refactor and cleanup
Move time series query logic to specific file.
Remove model parser and move to time series query file, adds parser test.
2018-05-23 14:36:41 +02:00
Marcus Efraimsson 1324a67cbd Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-23 14:35:45 +02:00
Carl Bergquist 64053e1954 Merge pull request #11788 from mtanda/prom_query_timeout
add query timeout option for Prometheus
2018-05-22 09:40:29 +02:00
Leonard Gram 1b85b2fca7 build: removes deploy from nightly while testing it. 2018-05-22 09:07:52 +02:00
Daniel Lee 6d6b509d27 Merge pull request #12020 from xginn8/patch-1
update provisioning.md
2018-05-21 18:14:33 +02:00
xginn8 68bc9dd9dc update provisioning.md
stylize & name datasources properly
2018-05-21 11:19:44 -04:00
Aleksei Magusev b7482ae8b7 Fix ResponseParser for InfluxDB to return only string values 2018-05-21 16:38:58 +02:00
Aleksei Magusev e104e9b2c2 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-05-21 16:38:53 +02:00
Sven Klemm cd49f2d425 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-21 15:58:31 +02:00
Leonard Gram 5f98982a09 build: clean up the workflow filters. 2018-05-21 15:57:57 +02:00
Daniel Lee de7a880d66 Revert "Conditionally select a field to return in ResponseParser for InfluxDB"
This reverts commit a101177b55.

Ref #12009
2018-05-21 15:47:29 +02:00
Daniel Lee 80f8fb1e02 Revert "Fix ResponseParser for InfluxDB to return only string values"
This reverts commit 92e5968f91.

Ref #12009
2018-05-21 15:46:23 +02:00
Mitsuhiro Tanda 067ceb178e Revert "move queryTimeout option to common setting"
This reverts commit 3ba59a1d66a2a3c07ccd04a48c403f0772fbef31.
2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda 12ace5ab65 move queryTimeout option to common setting 2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda 8ddcd67080 add query timeout option for Prometheus 2018-05-21 21:45:51 +09:00
Carl Bergquist a376de56f2 Merge pull request #11934 from liquidm/improve_alert_docs
Improve alert docs
2018-05-21 14:34:58 +02:00
Leonard Gram 7b1e41abc6 build: crosscompilation for nightlies and releases. 2018-05-21 14:06:01 +02:00
Sven Klemm 8b47d7c520 set style for registered query components 2018-05-21 12:53:06 +02:00
Sven Klemm 067bfa3f72 make param wrapper configurable 2018-05-21 12:52:14 +02:00
Sven Klemm a5bcd8eac0 fix metric column when using group by 2018-05-21 12:10:18 +02:00
Sven Klemm 3af4e4e0d6 separate label in template from type 2018-05-21 11:44:37 +02:00
Marcus Efraimsson cebae40468 Merge pull request #11973 from grafana/11953-explore-metricpanel
explore: fixes #11953
2018-05-21 11:13:22 +02:00
Sven Klemm e93276b1f8 use sql part component 2018-05-21 11:10:00 +02:00
Sven Klemm de9a117dc6 use sql part component 2018-05-21 11:04:52 +02:00
Sven Klemm 181dfdba04 add sql_part component 2018-05-21 09:37:04 +02:00
mammuthus 0cfdd726f7 Singlestat value: vertical alignment fix
There is a problem with vertical alignment of Singlestat value - it's a bit lower then it has to be.
This hack fix it.
2018-05-20 21:28:53 +03:00
Alexandre Georges 2e67e3ba63 Added Swiss franc currency 2018-05-20 14:07:40 +02:00
Sven Klemm b12d049f6f quote column name in buildValueQuery 2018-05-19 17:21:53 +02:00
Sven Klemm 731c7520b3 return values quotes for suggestions in where expression 2018-05-19 15:34:48 +02:00
Sven Klemm 9e05477558 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-19 12:27:23 +02:00
bergquist c40b0ea1df test: moves test files to testdata folder 2018-05-18 23:23:13 +02:00
Carl Bergquist dd8c50e140 Merge pull request #11988 from bergquist/tag_release_script
build: script for tagging and pushing a release
2018-05-18 16:37:11 +02:00
Leonard Gram 7ca346e9f0 build: downloads and bundles phantomjs for darwin and windows. 2018-05-18 14:39:25 +02:00
Leonard Gram 3933cb6bf6 build: publisher updated to support more architectures and OSs. 2018-05-18 14:39:25 +02:00
Leonard Gram 803694f41b build: saves artifacts with the build 2018-05-18 14:39:25 +02:00
Leonard Gram 9123e0fca8 build: crossplatform build with packages.
Big thanks to @fg2it who created a POC as
well as the build container that this work
is based on.
2018-05-18 14:38:04 +02:00
Daniel Lee 5de2c99c32 Merge pull request #11976 from steakunderscore/master
Adds constant description for units
2018-05-18 13:29:10 +02:00
bergquist f565800a51 build: script for tagging and pushing a release 2018-05-18 13:07:26 +02:00
Torkel Ödegaard a73365c3fe codespell: fixes 2018-05-18 11:49:00 +02:00
Torkel Ödegaard d0c17100cb fix: fixed some minor startup logging issues 2018-05-18 11:17:31 +02:00
Torkel Ödegaard 6c0752473a Sqlstore refactor (#11908)
* refactor: tracing service refactoring

* refactor: sqlstore to instance service

* refactor: sqlstore & registory priority

* refactor: sqlstore refactor wip

* sqlstore: progress on getting tests to work again

* sqlstore: progress on refactoring and getting tests working

* sqlstore: connection string fix

* fix: not sure why this test is not working and required changing expires

* fix: updated grafana-cli
2018-05-18 11:10:10 +02:00
Henry Jenkins f7c9fe6abc Adds constant description for units
Makes `km/h` constant with distances
2018-05-17 17:55:13 +01:00
bergquist 78e837cf39 test: increase expire time to avoid tz issues in tests 2018-05-17 14:59:50 +02:00
Daniel Lee f15919555b explore: fixes #11953 2018-05-17 14:56:15 +02:00
Patrick O'Carroll 1ab2928f9d migrated files to ts, removed unused functions from lodash_extended 2018-05-17 14:24:49 +02:00
Daniel Lee 75993971c6 docs: installation pages for 5.1.3 2018-05-16 21:48:26 +02:00
Daniel Lee 66c4a04dec changelog: add note for #11830 2018-05-16 17:46:32 +02:00
Daniel Lee b086981e15 Merge pull request #11954 from grafana/11830-firefox-legend
legend: fixes Firefox/baron scroll bug
2018-05-16 16:49:42 +02:00
Daniel Lee 574baa7151 Merge pull request #11719 from mtanda/annotation_on_non_editable_dashboard
create annotation on non-editable dashboard
2018-05-16 15:18:32 +02:00
Daniel Lee 3305ac1f36 Merge pull request #11946 from grafana/11937-panel-content
scroll: temporary fix for double scrollbar issue
2018-05-16 15:16:44 +02:00
Daniel Lee 50026fad2e legend: fixes Firefox/baron scroll bug
Compensates for Firefox scrollbar calculation error in the baron framework.
Offsetwidth and clientwidth are used to find the width of the scrollbar. In
the legend these differ by 9px and cause the scroll div to grow by 9px for
every refresh. This fix compensates with a negative margin-right in that
case.

Fixes #11830
2018-05-16 15:08:22 +02:00
Patrick O'Carroll b2027af4cb wrote classes 2018-05-16 13:37:26 +02:00
Patrick O'Carroll d83f886519 migrated jquery.flot.events to ts 2018-05-16 13:37:26 +02:00
Mitsuhiro Tanda 87c9c47579 use canMakeEditable 2018-05-16 11:58:51 +09:00
Mitsuhiro Tanda fe301142ba allow to add annotation for non editable dashboard 2018-05-16 11:51:28 +09:00
Daniel Lee 567fec402e scroll: temporary fix for double scrollbar issue
If #11939 is not merged in the patch release, then
this is a temporary fix for 5.1.3. It sets overflow to
hidden for larger screens and keeps the overflow set to
auto for mobiles and tablets.

Fixes #11937
2018-05-16 00:19:15 +02:00
Carl Bergquist 0841e67da8 Merge pull request #11940 from alexanderzobnin/plugin-meta-field
backend plugins: expose meta field
2018-05-15 20:20:28 +02:00
Alexander Zobnin 214b9af5a3 backend plugins: log an error if parsing meta field failed 2018-05-15 20:59:24 +03:00
Alexander Zobnin 4533f22871 backend plugins: expose meta field 2018-05-15 15:33:05 +03:00
Stuart McLean c09c00a1f5 fixes following first code review 2018-05-15 10:06:26 +02:00
Stuart McLean 295169b94f add useful note to alerting api docs 2018-05-14 20:50:44 +02:00
Stuart McLean 2dd40eb4e4 improve alerting api docs sample responses 2018-05-14 20:50:08 +02:00
Marcus Efraimsson b8c4aa3936 Merge pull request #11926 from grafana/davkal/fix-phantomjs-render
Use babel and hot loader only in yarn start
2018-05-14 13:47:35 +02:00
David 65f9970a3e Merge pull request #10434 from craig-miskell-fluxfederation/prometheus_align_queries
Align queries to prometheus with the step
2018-05-14 12:30:55 +02:00
David Kaltschmidt a1b92369db Merge remote-tracking branch 'origin/master' into prometheus_align_queries
* origin/master: (21 commits)
  docs: removes notes about beeing introduced in 5.0
  lock caniuse-db version to resolve phantomjs rendering issue
  Update dashboard_permissions.md
  move database-specific code into dialects (#11884)
  refactor: tracing service refactoring (#11907)
  fix typo in getLdapAttrN (#11898)
  docs: update installation instructions targeting v5.1.2 stable
  changelog: add notes about closing #11862, #11656
  Fix dependencies on Node v10
  Update dashboard.md
  changelog: add notes about closing #10338
  Phantom render.js is incorrectly retrieving number of active panels (#11100)
  singlestat: render time of last point based on dashboard timezone (#11425)
  Fix for #10078: symbol "&" is not escaped (#10137)
  Add alpha color channel support for graph bars (#10956)
  interpolate 'field' again in Elasticsearch terms queries (#10026)
  Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701)
  http_server: All files in public/build have now a huge max-age (#11536)
  fix: ldap unit test
  decrease length of auth_id column in user_auth table
  ...
2018-05-14 12:11:14 +02:00
David Kaltschmidt e731c248d7 Prometheus step alignment: shift interval only on jitter
* only increase interval by step if jitter happened
* shift both start and end
* simplified tests by using low epoch numbers
2018-05-14 12:08:30 +02:00
David Kaltschmidt dd66cbc847 Use babel and hot loader only in yarn start
* moved babel rules for hot reloading into TS loader
* toggling use of babel via HOT variable (true with `yarn start`)
* overriding webpack output when HOT to fix asset paths in dashboard
 urls like http://localhost:3333/d/...
2018-05-14 11:58:15 +02:00
bergquist ca25a25386 docs: removes notes about beeing introduced in 5.0 2018-05-14 09:51:23 +02:00
Marcus Efraimsson d3f516f1c4 Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-12 11:33:58 +02:00
Marcus Efraimsson 95285aa09f Merge pull request #11917 from grafana/fix_phantomjs
resolve phantomjs rendering in production build
2018-05-11 14:24:52 +02:00
Marcus Efraimsson 8ed856c64f lock caniuse-db version to resolve phantomjs rendering issue
For some reason a newer version of this sub-dependency makes phantomjs
rendering unable to generate and save a png image, however without
any error message logged
2018-05-11 14:10:54 +02:00
Marcus Efraimsson 26e1b3a3fa Merge pull request #11914 from b4456609/patch-1
docs: update dashboard_permissions.md
2018-05-11 09:21:23 +02:00
Bernie 1157542f70 Update dashboard_permissions.md
miss { in repsponse
2018-05-11 10:19:28 +08:00
Dan Cech 1dfff74da9 move database-specific code into dialects (#11884) 2018-05-10 16:54:21 +02:00
Torkel Ödegaard 27e1c67453 refactor: tracing service refactoring (#11907) 2018-05-10 16:51:55 +02:00
Dan Cech bc64754364 fix typo in getLdapAttrN (#11898) 2018-05-09 20:26:17 +02:00
Marcus Efraimsson 486aaca109 docs: update installation instructions targeting v5.1.2 stable 2018-05-09 14:03:22 +02:00
Marcus Efraimsson 4dfaab4c5b changelog: add notes about closing #11862, #11656
[skip ci]
2018-05-09 10:45:40 +02:00
Daniel Lee 2c3b8bb035 Merge pull request #9910 from jeroenj/patch-1
Adding a user in a specified organisation uses the admin API
2018-05-08 23:09:25 +02:00
Daniel Lee 377b78102d Merge pull request #11888 from simPod/fix-node10
Fix dependencies on Node v10
2018-05-08 23:03:51 +02:00
Simon Podlipsky 4565676233 Fix dependencies on Node v10 2018-05-08 22:18:58 +02:00
Carl Bergquist fa9a95f645 Merge pull request #11887 from simPod/patch-1
Update dashboard.md
2018-05-08 21:27:32 +02:00
Šimon Podlipský ef60d89742 Update dashboard.md 2018-05-08 21:25:45 +02:00
Torkel Ödegaard c79b1bef15 Merge branch 'master' into master 2018-05-08 21:23:34 +02:00
Marcus Efraimsson cde347bd3d Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-08 17:13:08 +02:00
Marcus Efraimsson 77421531d0 changelog: add notes about closing #10338
[skip ci]
2018-05-08 16:18:54 +02:00
Adrian Muraru 5377b82612 Phantom render.js is incorrectly retrieving number of active panels (#11100)
Fixes #11099
2018-05-08 16:05:22 +02:00
Marcus Efraimsson ef0b7bda6f singlestat: render time of last point based on dashboard timezone (#11425)
* singlestat: render time of last point based on dashboard timezone

* changelog: add note for #10338
2018-05-08 15:59:29 +02:00
Angrite e52aceeaba Fix for #10078: symbol "&" is not escaped (#10137)
Fix for #10078: Render value as link in Table panel: ampersand symbol "&" is not escaped in link URL, resulting URL is wrong.
2018-05-08 15:47:09 +02:00
Chris Rice 10f934d287 Add alpha color channel support for graph bars (#10956)
* Set fillColor in bars on load and on color change

* Change bar fill color on color override

* Added test for series overrides

* Moved bars fill color setting into time_series. Fixed issue with prev commit where you could not show bars because of series overrides.
2018-05-08 15:18:57 +02:00
Andrew Richards 3095dabe3c interpolate 'field' again in Elasticsearch terms queries (#10026)
* interpolate 'field' again in Elasticsearch terms queries

Fix for #8662 which was regressed in commit e4950c2dc1 (the field 'field' was no longer interpolated)

* remove unnecessary check for existence of field 'field'
2018-05-08 15:17:16 +02:00
Seuf 1888708ca5 Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701) 2018-05-08 14:04:20 +02:00
Thibaut Patel bdb736a9ee http_server: All files in public/build have now a huge max-age (#11536) 2018-05-08 13:54:00 +02:00
Marcus Efraimsson 219118ef4a Merge pull request #11867 from grafana/11862_migration
decrease length of auth_id column in user_auth table
2018-05-08 13:10:22 +02:00
Torkel Ödegaard 869d8e6f0e fix: ldap unit test 2018-05-08 12:50:39 +02:00
David 06aca5e8b5 Merge branch 'master' into prometheus_align_queries 2018-05-08 12:22:55 +02:00
bergquist 65352dccc0 only error log when err is not nil 2018-05-08 11:59:27 +02:00
bergquist b649358734 rename alerting engine to service 2018-05-08 11:56:30 +02:00
Tomasz Torcz e1b9d361ed case-insensitive LDAP group comparison (#9926)
* ldap: case-insensitive LDAP group comparison

According to RFC2251 4.1.5, LDAP strings are case-insensitive. Disregard case when comparing group mappings.

* ldap: add test for case-insensitive group mapping
2018-05-08 11:47:23 +02:00
Marcus Efraimsson 3d9ea3f1fa changelog: add notes about closing #11813
[skip ci]
2018-05-08 11:36:05 +02:00
Torkel Ödegaard 4aae3c6c05 Merge branch 'master' of github.com:grafana/grafana 2018-05-08 11:33:13 +02:00
Torkel Ödegaard cec783ca2c docs: updated changelog 2018-05-08 11:30:52 +02:00
Alexander Zobnin 00454b32f5 fix XSS vulnerabilities in dashboard links (#11813)
fix XSS vulnerabilities in dashboard links
2018-05-08 11:28:16 +02:00
Torkel Ödegaard 1c886940ff Merge branch 'jereksel-feature/save_json' 2018-05-08 11:25:20 +02:00
Torkel Ödegaard eb3aa7b193 PR: ux changes to #11528 2018-05-08 11:24:20 +02:00
Torkel Ödegaard 6a5ce09b08 Merge branch 'feature/save_json' of https://github.com/jereksel/grafana into jereksel-feature/save_json 2018-05-08 10:54:26 +02:00
bergquist 7e9a10a5fb renames alerting engine to match other services 2018-05-08 10:53:42 +02:00
Dan Cech 93a8d8a25b allow analytics.js to be cached, enable anonymizeIP setting (#11656) 2018-05-08 10:48:27 +02:00
Torkel Ödegaard a2b864dd6b Update CHANGELOG.md 2018-05-08 10:23:28 +02:00
Torkel Ödegaard f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)"
This reverts commit 34133671b9.
2018-05-08 09:45:08 +02:00
Torkel Ödegaard 4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Marcus Efraimsson 8ed79d614b decrease length of auth_id column in user_auth table
certain mysql versions don't support having indices with a greater varchar length
than 190.
2018-05-08 09:26:28 +02:00
Carl Bergquist 8d13276844 Merge pull request #11852 from grafana/davkal/super-simple-docker
Support for local Docker builds
2018-05-08 09:17:01 +02:00
Torkel Ödegaard b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll 8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley 34133671b9 Add baron scrollbar to a node managed by gafana (#11850)
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
2018-05-08 06:39:12 +02:00
David ed067e8d35 Fix CSS asset loading for yarn start (HMR) (#11855)
* enable url() processing in CSS to ensure assets load in HMR mode
* only needed when running `yarn start` which needs this for the hot
reloader
2018-05-07 17:02:55 +02:00
Torkel Ödegaard 4c6e4e2aa6 fix: fixed gometalinter issues with Discord PR 2018-05-07 17:01:31 +02:00
Carl Bergquist 23738ad4ac Merge pull request #11801 from grafana/provision-service-refactor
Server shutdown flow rewrite & provision service refactor
2018-05-07 16:32:26 +02:00
David 1236b7b918 Merge pull request #11770 from grafana/davkal/explore-panel-link
Explore: Add entry to panel menu to jump to Explore
2018-05-07 16:31:19 +02:00
Torkel Ödegaard b170bde74f Update CHANGELOG.md 2018-05-07 15:44:34 +02:00
Torkel Ödegaard c46a3c8646 Merge branch 'jereksel-feature/discord' 2018-05-07 15:41:10 +02:00
Torkel Ödegaard e5e8b9800c merge: fixed conflicts in discord PR 2018-05-07 15:40:43 +02:00
Marcus Efraimsson 23c88a3b3f docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Dan Cech 29c9d3f74c fix root_url in docs & comments (#11819)
* fix root_url in docs & comments

* include ports in docker-compose config
2018-05-07 14:18:21 +02:00
Marcus Efraimsson b804f6d999 changelog: 5.1.1 update
add notes about closing #11743 and add release data for 5.1.1
[skip ci]
2018-05-07 14:09:04 +02:00
Torkel Ödegaard 249c1e8d3d fix: loading of css url (images/fonts) 2018-05-07 14:02:38 +02:00
David Kaltschmidt c3cc60b080 Support for local Docker builds
* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
2018-05-07 12:32:18 +02:00
Torkel Ödegaard afec9ec5be Update ROADMAP.md 2018-05-07 11:16:59 +02:00
Dan Cech 543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Dan Cech b4ad044044 better handling for special chars in db config (#11662) 2018-05-07 10:33:33 +02:00
Florian Plattner 5d54bc00e1 Fix/improved csv output (#11740)
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
2018-05-07 10:22:54 +02:00
Torkel Ödegaard 871b85f199 Update ROADMAP.md 2018-05-07 10:16:39 +02:00
Torkel Ödegaard ec7703bad7 Update ROADMAP.md 2018-05-07 10:14:04 +02:00
Torkel Ödegaard 217d43e512 Update ROADMAP.md 2018-05-07 10:13:39 +02:00
Carl Bergquist 06623506d3 Merge pull request #11805 from simPod/missing-lock
Add missing items to Gopkg.lock
2018-05-07 10:08:05 +02:00
Torkel Ödegaard fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Šimon Podlipský 1fbac909cb Remove preceding / from public JS path (#11804) 2018-05-07 08:11:48 +02:00
Ryan McKinley 2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Marcus Efraimsson e078e2733f Merge pull request #11803 from svenklemm/whatsnew51-table
Fix variable interpolation examples in whats new in 5.1 docs
2018-05-06 08:45:02 +02:00
Sven Klemm 1dd2bce054 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-05 13:33:54 +02:00
Sven Klemm ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +02:00
Marcus Efraimsson 8523b1e410 changelog: add notes about closing #11616
[skip ci]
2018-05-04 15:03:30 +02:00
Marcus Efraimsson d0753949bc Merge pull request #11794 from grafana/11616-timepicker-buttons
fix dark/light theme date selector styling in timepicker control
2018-05-04 14:55:56 +02:00
Patrick O'Carroll 515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson 4d2e6b4a34 changelog: add notes about closing #11800
[skip ci]
2018-05-03 19:13:57 +02:00
Marcus Efraimsson 6eba9c2438 Merge pull request #11802 from svenklemm/variable-interpolation
dont shadow format passed in as function parameter in replace function in templatesrv
2018-05-03 19:09:40 +02:00
Sven Klemm a806f542c6 test if default variable interpolation is effective when no specific
format is specified
2018-05-03 18:42:58 +02:00
Marcus Efraimsson 8a9da4ba66 changelog: notes about closing #11690
[skip ci]
2018-05-03 18:42:14 +02:00
Marcus Efraimsson da8f6c150b Merge pull request #11751 from mtanda/11690
fix to match table column name and order
2018-05-03 18:33:46 +02:00
Daniel Lee d518ed5330 changelog: add notes for ##11754, #11758, #11710 2018-05-03 15:46:21 +02:00
Daniel Lee 2c10f29b0f Merge pull request #11784 from grafana/11754_auth_migration
increase length of auth_id column in user_auth table
2018-05-03 15:30:38 +02:00
Daniel Lee 7db9cc3bf0 Merge pull request #11796 from alexanderzobnin/fix-11710
scroll: fix scrolling on mobile Chrome
2018-05-03 15:18:29 +02:00
Marcus Efraimsson 99257eb048 Merge branch 'master' of git://github.com/grafana/grafana into WPH95-feature/add_es_alerting 2018-05-03 12:03:04 +02:00
Alexander Zobnin 83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Simon Podlipsky fc0a4b34a1 Add missing items to Gopkg.lock 2018-05-03 01:25:52 +02:00
Sven Klemm f52920aa01 pipe escape try #3 2018-05-03 00:23:35 +02:00
Sven Klemm 7f8dacd087 use ascii code for pipe symbol to not mess up markdown table 2018-05-03 00:19:47 +02:00
Sven Klemm fc7d876158 try to fix table 2018-05-03 00:17:18 +02:00
Sven Klemm 764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Torkel Ödegaard c40a50829d fix: removed manully added http server from inject graph as it is now a self registered service 2018-05-02 21:30:15 +02:00
Torkel Ödegaard b5e70d4607 fix: removed unused channel 2018-05-02 19:56:15 +02:00
Torkel Ödegaard e3ea6c683c fix: comment spell fix 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 23655315b8 fix: fixed race condition between http.Server ListenAndServe & Shutdown, now service crash during startup correctly closes http server every time 2018-05-02 19:56:15 +02:00
Torkel Ödegaard d04ad835e2 refactoring: lots of refactoring around server shutdown flows, making sure process is terminated when background service has crashed 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 14bb7832af Metrics package now follows new service interface & registration (#11787)
* refactoring: metrics package now follows new service interface & registration

* fix: minor fix, make sure metrics service is imported, by grafana-server
2018-05-02 19:54:07 +02:00
Marcus Efraimsson 04d071aaa3 Merge pull request #11797 from grafana/revert-11775-unindent
Revert "Opportunities to unindent code (unindent)"
2018-05-02 14:19:55 +02:00
Marcus Efraimsson de0d409a23 Revert "Opportunities to unindent code (unindent)" 2018-05-02 14:06:46 +02:00
Alexander Zobnin 64283408ee scroll: fix scrolling on mobile Chrome (#11710) 2018-05-02 12:43:25 +03:00
Marcus Efraimsson 6dcb9e696d changelog: add notes about closing #11625
[skip ci]
2018-05-02 11:19:22 +02:00
Marcus Efraimsson f17100e98e Merge pull request #11786 from marefr/11625_save_as
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
2018-05-02 11:15:22 +02:00
Marcus Efraimsson 1f21b3e23b remove jest it.only to not skip important tests 2018-05-02 10:54:00 +02:00
Patrick O'Carroll 3dd073f98d fixed so all buttons are styled not just small ones, fixes #11616 2018-05-02 09:56:53 +02:00
Carl Bergquist 6ed69e3d93 Merge pull request #11775 from knweiss/unindent
Opportunities to unindent code (unindent)
2018-05-01 16:03:06 +02:00
Torkel Ödegaard 2b93cbbf04 --amend 2018-05-01 14:18:10 +02:00
Torkel Ödegaard 13e015fe3f fix: improved handling of http server shutdown 2018-05-01 14:14:11 +02:00
Mitsuhiro Tanda 253b2cc081 add test for prometheus table column title 2018-05-01 05:00:56 +09:00
David Kaltschmidt 8a53ec610b Fix url encoding, expand template vars, fix TS hacks
* moved datasource related functions to panel sub-class
* expand panel template vars for url
* added keybindings for x -> Explore
* url encoding for explore state
2018-04-30 17:44:30 +02:00
David Kaltschmidt 05b0bfafe4 Explore: Add entry to panel menu to jump to Explore
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
2018-04-30 17:44:28 +02:00
Marcus Efraimsson 0fc4da810f changelog: notes about closing #11498
[skip ci]
2018-04-30 16:33:27 +02:00
Marcus Efraimsson b0349bc795 Merge pull request #11575 from alexanderzobnin/fix-11498
Histogram: fix invisible highest value bucket
2018-04-30 16:32:21 +02:00
Torkel Ödegaard fa7d7ed5df Initial Baby Step to refactoring settings from global vars to instance (#11777)
* wip: start on refactoring settings

* settings: progress on settings refactor

* refactor: progress on settings refactoring

* fix: fixed failing test

* settings: moved smtp settings from global to instance
2018-04-30 16:21:04 +02:00
Daniel Lee fc718b8a9a table: fix for padding
The table-panel-wrapper class got removed when clicking on the panel
menu which resulted in extra padding for the .panel-content div. This
fixes that by setting the table-specific css class lower down in the
html.
2018-04-30 16:17:37 +02:00
Alexander Zobnin b16626c3b5 graph histogram: fix invisible highest value bucket 2018-04-30 16:12:31 +02:00
Marcus Efraimsson 5c57c7cff5 dashboard: show save as button if can edit and has edit permission to folders 2018-04-30 15:38:46 +02:00
Marcus Efraimsson 770acee56a new property for current user indicating if edit permissions in folders 2018-04-30 15:34:31 +02:00
Marcus Efraimsson 3d9b7a5892 increase length of auth_id column in user_auth table 2018-04-30 14:41:52 +02:00
Marcus Efraimsson 4f7791b9fa fix dropdown typeahead issue
New explore feature overriding css for dropdown typeahead component.
2018-04-30 11:50:50 +02:00
Karsten Weiss 893a91af3a Use opportunities to unindent code (unindent)
This commit fixes the following unindent findings:
pkg/api/common.go:102:2: "if x { if y" should be "if x && y"
pkg/components/dynmap/dynmap.go:642:2: invert condition and early return
pkg/components/dynmap/dynmap.go:681:2: invert condition and early return
pkg/components/simplejson/simplejson.go:171:2: "if x { if y" should be "if x && y"
pkg/middleware/dashboard_redirect.go:42:3: invert condition and early return
pkg/tsdb/mssql/mssql.go:301:3: invert condition and early break
pkg/tsdb/mysql/mysql.go:312:3: invert condition and early break
pkg/tsdb/postgres/postgres.go:292:3: invert condition and early break
pkg/tsdb/sql_engine.go:144:2: invert condition and early return
2018-04-28 10:53:16 +02:00
Carl Bergquist c5419ba885 Merge pull request #11774 from knweiss/golint
Fix golint warnings
2018-04-28 09:40:56 +02:00
Karsten Weiss de8696d5d3 Outdent code after if block that ends with return (golint)
This commit fixes the following golint warnings:
pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block
pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block
pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block
pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block
pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block
pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block
pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block
pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block
pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
2018-04-27 23:10:43 +02:00
Karsten Weiss b7adf28501 Remove redundancy in variable declarations (golint)
This commit fixes the following golint warnings:
pkg/api/avatar/avatar.go:229:12: should omit type *http.Client from declaration of var client; it will be inferred from the right-hand side
pkg/login/brute_force_login_protection.go:13:26: should omit type time.Duration from declaration of var loginAttemptsWindow; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:58:26: should omit type []string from declaration of var metricCategoryPrefix; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:69:22: should omit type []string from declaration of var trimMetricPrefix; it will be inferred from the right-hand side
pkg/models/alert.go:37:36: should omit type error from declaration of var ErrCannotChangeStateOnPausedAlert; it will be inferred from the right-hand side
pkg/models/alert.go:38:36: should omit type error from declaration of var ErrRequiresNewState; it will be inferred from the right-hand side
pkg/models/datasource.go:61:28: should omit type map[string]bool from declaration of var knownDatasourcePlugins; it will be inferred from the right-hand side
pkg/plugins/update_checker.go:16:13: should omit type http.Client from declaration of var httpClient; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:103:24: should omit type time.Duration from declaration of var unfinishedWorkTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:105:19: should omit type time.Duration from declaration of var alertTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:106:19: should omit type int from declaration of var alertMaxAttempts; it will be inferred from the right-hand side
pkg/services/alerting/notifier.go:143:23: should omit type map[string]*NotifierPlugin from declaration of var notifierFactories; it will be inferred from the right-hand side
pkg/services/alerting/rule.go:136:24: should omit type map[string]ConditionFactory from declaration of var conditionFactories; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:12:15: should omit type []string from declaration of var defaultTypes; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:13:15: should omit type []string from declaration of var rangedTypes; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/opsgenie.go:44:19: should omit type string from declaration of var opsgenieAlertURL; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/pagerduty.go:43:23: should omit type string from declaration of var pagerdutyEventApiUrl; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/telegram.go:21:17: should omit type string from declaration of var telegramApiUrl; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:11:24: should omit type string from declaration of var simpleDashboardConfig; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:12:24: should omit type string from declaration of var oldVersion; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:13:24: should omit type string from declaration of var brokenConfigs; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:22:30: should omit type time.Duration from declaration of var checkDiskForChangesInterval; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:24:23: should omit type error from declaration of var ErrFolderNameMissing; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:15:34: should omit type string from declaration of var twoDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:16:34: should omit type string from declaration of var twoDatasourcesConfigPurgeOthers; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:17:34: should omit type string from declaration of var doubleDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:18:34: should omit type string from declaration of var allProperties; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:19:34: should omit type string from declaration of var versionZero; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:20:34: should omit type string from declaration of var brokenYaml; it will be inferred from the right-hand side
pkg/services/sqlstore/stats.go:16:25: should omit type time.Duration from declaration of var activeUserTimeLimit; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:69:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:70:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:95:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:96:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/setting/setting.go:42:15: should omit type string from declaration of var Env; it will be inferred from the right-hand side
pkg/setting/setting.go:161:18: should omit type bool from declaration of var LdapAllowSignup; it will be inferred from the right-hand side
pkg/setting/setting.go:473:30: should omit type bool from declaration of var skipStaticRootValidation; it will be inferred from the right-hand side
pkg/tsdb/interval.go:14:21: should omit type time.Duration from declaration of var defaultMinInterval; it will be inferred from the right-hand side
pkg/tsdb/interval.go:15:21: should omit type time.Duration from declaration of var year; it will be inferred from the right-hand side
pkg/tsdb/interval.go:16:21: should omit type time.Duration from declaration of var day; it will be inferred from the right-hand side
pkg/tsdb/cloudwatch/credentials.go:26:24: should omit type map[string]cache from declaration of var awsCredentialCache; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:15:27: should omit type *regexp.Regexp from declaration of var regexpOperatorPattern; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:16:27: should omit type *regexp.Regexp from declaration of var regexpMeasurementPattern; it will be inferred from the right-hand side
pkg/tsdb/mssql/mssql_test.go:25:14: should omit type string from declaration of var serverIP; it will be inferred from the right-hand side
2018-04-27 22:14:36 +02:00
Torkel Ödegaard b3531362ca fix: minor fix to plugin service shut down flow 2018-04-27 21:22:29 +02:00
Daniel Lee 7e2fb5e92e appveyor: uppercase the C drive in go path
Fixes #11758
2018-04-27 17:32:53 +02:00
David cc74f6c6a0 Merge pull request #11761 from grafana/davkal/explore-multi-row
Explore: add support for multiple queries
2018-04-27 17:31:25 +02:00
Leonard Gram ec23816df6 docs: further documents changes to the docker image. (#11763)
* docs: further documents changes to the docker image.
* docs: explains the changes to user id better.
2018-04-27 17:06:08 +02:00
bergquist c902ec1808 Merge branch 'notification-service-refactor2'
* notification-service-refactor2:
  fix: removed log calls used while troubleshooting
  refactor: refactoring notification service to use new service registry hooks
2018-04-27 16:59:32 +02:00
Carl Bergquist 2cc855a131 Merge branch 'master' into notification-service-refactor2 2018-04-27 16:59:14 +02:00
bergquist 0cbeb56af1 disable ent build to avoid slowing down build speed 2018-04-27 16:41:07 +02:00
David d8abfe6a7d Merge pull request #11742 from grafana/davkal/explore
Explore UI skeleton
2018-04-27 15:46:40 +02:00
David Kaltschmidt 949e3d29e8 Explore: add support for multiple queries
* adds +/- buttons to query rows in the Explore section
* on Run Query all query expressions are submitted
* `generateQueryKey` and `ensureQueries` are helpers to ensure each
 query field has a unique key for react.
2018-04-27 15:42:35 +02:00
David Kaltschmidt 25d3ec5bbf Fixed settings default and explore path 2018-04-27 15:35:46 +02:00
Torkel Ödegaard a8eed9d344 Refactoring PluginManager to be a self registering service (#11755)
* refator: refactored PluginManager to be a self registering service, a lot more work needed to fully make plugin manager use instance variables and not so many globals
2018-04-27 15:11:55 +02:00
Torkel Ödegaard 44b0f15a61 fix: removed log calls used while troubleshooting 2018-04-27 14:28:42 +02:00
Torkel Ödegaard df71fe33fd refactor: refactoring notification service to use new service registry hooks 2018-04-27 14:15:17 +02:00
Marcus Efraimsson 8f29d28572 Merge pull request #11753 from grafana/11743_unit_revert
revert renaming of unit key ppm
2018-04-27 14:02:57 +02:00
Carl Bergquist 28f7b6dad1 Enable Grafana extensions at build time. (#11752)
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
2018-04-27 13:41:58 +02:00
Marcus Efraimsson 138c8c348e revert renaming of unit key ppm
#11211 removed the unit key ppm in favor of conppm. A change which is not forward compatible.
This commit revert the unit key back to ppm.
Also adds some better error description if trying to use a unit which don't exists.
Fixes #11743
2018-04-27 13:41:20 +02:00
Mitsuhiro Tanda c2b720835b fix to match table column name and order 2018-04-27 19:34:10 +09:00
David Kaltschmidt d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt 1e6e89121c Settings to enable Explore UI 2018-04-27 11:39:14 +02:00
bergquist afce0feb05 Merge branch 'mjtrangoni-fix-deadcode-issues'
* mjtrangoni-fix-deadcode-issues:
  tech: removes unused code
  add deadcode linter to circleci
  pkg: fix deadcode issues
  build.go: fix deadcode issues
2018-04-27 10:41:56 +02:00
bergquist 8e9b3507c5 tech: removes unused code 2018-04-27 10:39:06 +02:00
bergquist 034f5921cc Merge branch 'fix-deadcode-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-deadcode-issues
* 'fix-deadcode-issues' of https://github.com/mjtrangoni/grafana:
  add deadcode linter to circleci
  pkg: fix deadcode issues
  build.go: fix deadcode issues
2018-04-27 10:31:44 +02:00
David Kaltschmidt f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
Mario Trangoni 0459261d19 add deadcode linter to circleci 2018-04-26 19:24:21 +02:00
Mario Trangoni 97fd66db2e pkg: fix deadcode issues 2018-04-26 19:24:21 +02:00
Mario Trangoni 7aaa188471 build.go: fix deadcode issues 2018-04-26 19:04:07 +02:00
Marcus Efraimsson b53a57610b docs: update current version to 5.1 2018-04-26 18:59:45 +02:00
Marcus Efraimsson 6fa7ffc23f docs: update installation instructions targeting v5.1.0 stable 2018-04-26 18:56:44 +02:00
Marcus Efraimsson 914071993d Merge branch 'docs-5.1' 2018-04-26 18:44:51 +02:00
Daniel Lee 44a61a6db3 changelog: update for v5.1.0 2018-04-26 18:18:54 +02:00
Marcus Efraimsson 28781e7dfd Merge pull request #11736 from grafana/11735_ga
fix so that google analytics script are cached
2018-04-26 16:01:08 +02:00
Marcus Efraimsson ddeba41638 fix so that google analytics script are cached 2018-04-26 15:49:22 +02:00
Daniel Lee 1dd4f03100 Merge pull request #11726 from grafana/11708_prom_variables
prometheus: variable query should fallback correctly to a series query
2018-04-26 10:29:09 +02:00
Daniel Lee 375816106e Merge pull request #11714 from grafana/11703_mysql_ts_datatypes
sql tsdb: fix value columns conversion to float when using timeseries query
2018-04-25 23:17:22 +02:00
Marcus Efraimsson fff5d7154e Merge pull request #11721 from grafana/11677-missaligned-menu-carot
fix misalignment of unit and other drop downs in firefox
2018-04-25 17:24:54 +02:00
Daniel Lee 4b73f67703 Merge pull request #11722 from grafana/ie11-panel-edit-height
removed height 100% from panel-container to fix ie11 panel edit mode
2018-04-25 16:26:41 +02:00
Daniel Lee 3000a2a43b Merge pull request #11652 from grafana/davkal/hmr
Add weback-dev-server with hot/hmr support
2018-04-25 15:52:53 +02:00
Marcus Efraimsson f112e38266 prometheus: convert metric find query tests to jest 2018-04-25 15:37:58 +02:00
Marcus Efraimsson 6687409efb prometheus: fix variable query to fallback correctly to series query
Using a query of for example up or up{job=job1}
2018-04-25 15:37:58 +02:00
Patrick O'Carroll 6836268f3e removed height 100% from panel-container to fix ie11 panel edit mode 2018-04-25 12:44:39 +02:00
Patrick O'Carroll 99aa9a46bc replaced border hack carot with fontawesome carot fixes #11677 2018-04-25 12:16:43 +02:00
Leonard Gram 1290087b78 dev: Mac compatible prometheus block. (#11718) 2018-04-25 11:01:33 +02:00
David c99d6bd505 Merge pull request #11678 from grafana/davkal/11673-silent-response
Add silent option to backend requests
2018-04-25 09:46:41 +02:00
Carl Bergquist f2b5b6f299 Merge pull request #11694 from flopp999/patch-5
Added requests/sec(throughput)
2018-04-24 21:30:34 +02:00
Marcus Efraimsson 7626775491 Merge pull request #11695 from grafana/11508_variables_preview_values
allow to show more preview values for variables
2018-04-24 20:05:47 +02:00
Marcus Efraimsson 1452634a2a mssql: fix value columns conversion to float when using timeseries query 2018-04-24 19:54:08 +02:00
Marcus Efraimsson cf43007531 postgres: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:36 +02:00
Marcus Efraimsson 346577b664 mysql: fix value columns conversion to float when using timeseries query 2018-04-24 19:53:06 +02:00
Marcus Efraimsson 76bd2aea44 sql datasource: extract common logic for converting value column to float 2018-04-24 19:50:14 +02:00
Patrick O'Carroll a40314022b added pointer to show more, reset values on new query 2018-04-24 17:40:03 +02:00
Marcus Efraimsson 7992897418 docs: add known issues section for mssql documentation
Fixes #11707
2018-04-24 16:30:24 +02:00
David Kaltschmidt 707700ac7d force GET for metadataRequests, w/ test 2018-04-24 16:26:46 +02:00
Marcus Efraimsson 85ccefdb84 Merge branch 'master' into docs-5.1 2018-04-24 16:17:15 +02:00
Marcus Efraimsson d36efddcf7 Merge pull request #11699 from grafana/11466-edit-row
fixed so user who can edit dashboard can edit row
2018-04-24 14:57:50 +02:00
Carl Bergquist 005556632f Merge pull request #11705 from mjtrangoni/fix-ineffassign-issues
Fix ineffassign issues
2018-04-24 12:56:16 +02:00
David Kaltschmidt 006286ac05 Renamed helperRequest and removed positional args
From review feedback:

* s/helper/metadata
* combined positional args to _request into options dict
* metadataRequest reuses _request()
* moved consumption of this.httpMethod into _request, can be overwritten
 in options due to spread-after
2018-04-24 12:27:37 +02:00
David Kaltschmidt 0695e431ea Move function calls w/ side-effects to componentDidMount
* loadStore() modified the url which triggered a new render path, this
gets noticed by react. Moved to componentDidMount.
2018-04-24 12:07:24 +02:00
Patrick O'Carroll 38a4a2dc60 changed test name and dashboardMock code 2018-04-24 11:22:58 +02:00
Patrick O'Carroll 1446f54447 fixed test 2018-04-24 09:45:53 +02:00
Mario Trangoni 2e927a1053 add ineffassign to circleci gometalinter check 2018-04-23 20:07:31 +02:00
Mario Trangoni b02a860e66 pkg/components: fix ineffassign issues 2018-04-23 20:03:57 +02:00
Mario Trangoni 15f11effa0 pkg/cmd: fix ineffassign issues 2018-04-23 19:34:55 +02:00
Mario Trangoni bc570bb140 pkg/log: fix ineffassign issues 2018-04-23 19:31:23 +02:00
Mario Trangoni 6eb00000fe pkg/services: fix ineffassign issues 2018-04-23 19:28:54 +02:00
Patrick O'Carroll 45e6d9fcc4 removed import config 2018-04-23 17:45:51 +02:00
Patrick O'Carroll 3eaaa5d32d fixed so user who can edit dashboard can edit row, fixes #11466 2018-04-23 17:44:29 +02:00
Leonard Gram 3a48ea8dde Fixes signing of packages.
Signing was failing as the builds
were expected to run as ubuntu but
is run as root.

Closes #11686
2018-04-23 17:05:32 +02:00
Dan Cech affd3d15a0 Merge pull request #11150 from sbskas/master
Make Ldap group composed of  DNs work.
2018-04-23 10:49:45 -04:00
Marcus Efraimsson d14ac54af6 db: fix failing user auth tests for postgres 2018-04-23 16:02:59 +02:00
Daniel Lee 1dea5cb34b Merge pull request #11683 from marefr/11668_default_permissions
Fix for default permissions on folder are not shown as inherited in it's dashboards
2018-04-23 14:58:22 +02:00
flopp999 28ce71253f changed rps to reqps 2018-04-23 14:06:25 +02:00
bergquist 3cca45dd88 bump version 2018-04-23 13:59:52 +02:00
Patrick O'Carroll c2cc77fa08 added button to show more preview values for variables, button runs a function that increases options limit, fixes #11508 2018-04-23 13:00:24 +02:00
flopp999 1cc4c0c1f0 Added requests/sec(throughput)
#9630
2018-04-23 12:05:26 +02:00
Marcus Efraimsson 079346917f use inherited property from api when rendering permissions 2018-04-23 09:23:31 +02:00
Marcus Efraimsson d86ed679b1 return inherited property for permissions 2018-04-23 09:23:14 +02:00
Carl Bergquist 6315142d00 Merge pull request #11689 from mjtrangoni/fix-ineffassign-issues
pkg/tsdb: fix ineffassign isues
2018-04-23 07:57:55 +02:00
Carl Bergquist 7e089314f7 Merge pull request #11688 from mjtrangoni/fix-gometalinter-circleci
fix CircleCI gometalinter test
2018-04-23 07:54:21 +02:00
Andrzej Ressel 9d5ccaef54 Merge branch 'master' into feature/save_json 2018-04-22 21:24:52 +02:00
Mario Trangoni 556219b192 pkg/tsdb: fix ineffassign isues 2018-04-22 20:51:58 +02:00
Mario Trangoni fd20aa7c03 fix circleci gometalinter test 2018-04-22 16:22:29 +02:00
Daniel Lee 6b5854936d Merge pull request #11502 from marefr/graphite_ds_test
graphite: use a query when testing data source
2018-04-22 11:31:51 +02:00
Daniel Lee b5a54c535b Merge pull request #11654 from svenklemm/postgres-docs-timefilter
postgres: adjust timeFilter, timeFrom and timeTo macro examples
2018-04-22 11:16:15 +02:00
Sven Klemm eb994ad72e Merge remote-tracking branch 'upstream/master' into postgres-docs-timefilter 2018-04-21 18:31:45 +02:00
Jonathan McCall 069012639a Sort results from GetDashboardTags 2018-04-20 12:17:17 -04:00
Daniel Lee 3451f9a9db Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created 2018-04-20 17:14:06 +02:00
David Kaltschmidt 53817b7429 Add silent option to backend requests
* When set to `true`, the `silent` option for backend_srv requests
 suppresses all event emitters that are triggered when the response is
received.
* Added `helperRequest()` to the Prometheus datasource to support
 requests that are not triggered by the user, e.g., for tab completion.
`helperRequest()` sets the `silent` option.
* Migrated all non-timeseries queries of the Prometheus datasource to
 use `helperRequest()`.

Fixes #11673
2018-04-20 15:28:04 +02:00
Daniel Lee 8f9d9ed35d docs: escape asterisk in Graphite docs 2018-04-20 15:27:20 +02:00
Daniel Lee f4f12c1e84 Merge remote-tracking branch 'upstream/master' into docs-5.1 2018-04-20 15:15:42 +02:00
Daniel Lee bde0136317 Merge pull request #11671 from grafana/docs-variable-interpolation-mssql
Docs for mssql for #11642
2018-04-20 15:09:20 +02:00
Daniel Lee 2b3c547589 Merge pull request #11642 from grafana/docs-variable-interpolation
Docs variable interpolation
2018-04-20 15:09:05 +02:00
Daniel Lee ba2e43f547 docs: disable quoting option for MSSQL 2018-04-20 13:36:07 +02:00
Daniel Lee 492f842c53 docs: fix example for graphite tag query
Was missing a tilde in the tag_values example
2018-04-20 13:32:17 +02:00
Daniel Lee 3a99148315 docs: spelling 2018-04-20 13:24:37 +02:00
bergquist e168bfe03e docs: release 5.1.0-beta1 2018-04-20 13:23:45 +02:00
Daniel Lee 71dcafebb8 docs: add missing backtick for mysql/postgres 2018-04-20 13:22:43 +02:00
Daniel Lee c10359dd5b docs: fixes for table in variable docs 2018-04-20 13:21:14 +02:00
bergquist 177220e2fe build: fixes release deploy 2018-04-20 12:59:44 +02:00
bergquist d7f58d74d3 changelog: adds releaste date for 5.1.0-beta1 2018-04-20 11:16:24 +02:00
Daniel Lee cdbd4e0fc0 graphite: convert ds test to jest 2018-04-20 11:09:52 +02:00
Daniel Lee c2064781a0 Merge pull request #11640 from grafana/11637-dropdown-styling
removed padding and moved carrot
2018-04-20 11:05:40 +02:00
Dan Cech 7cc3d0c34e Merge branch 'master' into master 2018-04-19 12:01:48 -04:00
Sven Klemm 5076f9304b slightly better example 2018-04-19 17:01:48 +02:00
Sven Klemm 048cecdab5 adjust timeFilter, timeFrom and timeTo macro examples 2018-04-19 16:56:58 +02:00
Marcus Efraimsson 9fc59cc212 Merge pull request #11644 from grafana/11392_whats_new_v51
docs: What's new in v5.1
2018-04-19 16:37:04 +02:00
Marcus Efraimsson 727a7bf27a docs: what's new improvements 2018-04-19 16:26:42 +02:00
Marcus Efraimsson 886c8b823a docs: what's new improvements 2018-04-19 14:51:33 +02:00
bergquist b5820d930c Merge branch 'master' into 11392_whats_new_v51
* master:
  build: only lint the pkg folder
  changelog: adds note about closing #11476
  singlestat: Fix optimization in setTableColumnToSensibleDefault
  influxdb: Check before assuming first column to be 'time'
2018-04-19 14:27:13 +02:00
bergquist ffb1db833c docs: what's new
add's info about new template variable interpolation
2018-04-19 14:23:47 +02:00
Marcus Efraimsson 540bde269e docs: fix typos 2018-04-19 13:49:40 +02:00
Marcus Efraimsson cc3418f6a3 docs: what's new
Improved scrolling experience
2018-04-19 13:44:37 +02:00
bergquist b4a77d49b4 docs: whats new
reduce content a little bit and highlight mssql and prom heatmap
2018-04-19 13:39:02 +02:00
bergquist 601a1d9b92 docs: more info prometheus heapmap to whats new 2018-04-19 13:33:50 +02:00
Marcus Efraimsson 6737f79331 docs: improve what's new in v5.1 2018-04-19 13:25:16 +02:00
Marcus Efraimsson 250f85b9bd docs: what's new in v5.1 draft 2018-04-19 12:54:10 +02:00
David Kaltschmidt cc5d7002b0 Add weback-dev-server with hot/hmr support
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
2018-04-19 11:42:53 +02:00
Marcus Efraimsson ba9c3f60c4 Merge branch 'master' into docs-5.1 2018-04-19 10:52:17 +02:00
Marcus Efraimsson cec9634f4a fix typo 2018-04-18 14:52:36 +02:00
Daniel Lee ab4f8c273d docs: describes variable formatting options
csv option in postgres/mysql docs and the regex option in the
graphite docs
2018-04-18 14:40:34 +02:00
Daniel Lee 120a86ecf9 docs: graphite template variables for tag queries
ref #11388 and ref #9911 and ref #10366
2018-04-18 14:40:34 +02:00
Daniel Lee 24ae9cef36 docs: describes new variable formatting syntax
Fixes #11388
Ref #11141
2018-04-18 14:40:34 +02:00
Marcus Efraimsson 7e8bd8d004 Merge branch 'master' into docs-5.1 2018-04-18 14:39:38 +02:00
Patrick O'Carroll e794951087 removed padding and moved carrot 2018-04-18 10:21:48 +02:00
Marcus Efraimsson d30835f648 docs: update provisioning documentation
In addition to closing #10883
2018-04-17 17:22:25 +02:00
Marcus Efraimsson b142d6a037 Merge branch 'master' into docs-5.1 2018-04-17 16:50:26 +02:00
Marcus Efraimsson ad22e20ecd docs: update postgres macro functions documentation
In addition to closing #11578
2018-04-17 00:06:25 +02:00
Marcus Efraimsson 979f2d79fb Merge branch 'master' into docs-5.1 2018-04-16 23:58:50 +02:00
Leonard Gram abed9c055f docs: new docker image in Grafana 5.1.0. 2018-04-16 15:33:15 +02:00
Marcus Efraimsson c9f5568332 Merge branch 'master' into docs-5.1 2018-04-16 14:35:43 +02:00
Marcus Efraimsson 92ac1fbb5b Merge branch 'master' into docs-5.1 2018-04-16 09:58:46 +02:00
Sven Klemm 1c0a188272 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-13 22:18:32 +02:00
Marcus Efraimsson 48143d6caf Merge branch 'master' into docs-5.1 2018-04-13 16:40:38 +02:00
Marcus Efraimsson 9c492bd774 docs: add mssql provisioning example 2018-04-13 15:53:45 +02:00
Marcus Efraimsson 428d4b0dbf Merge branch 'master' into docs-5.1 2018-04-13 15:44:53 +02:00
Marcus Efraimsson f2c5417ee4 Merge branch 'master' into docs-5.1 2018-04-13 11:36:54 +02:00
Marcus Efraimsson aa59843902 docs: update mssql with azure sql database support 2018-04-13 11:36:40 +02:00
Marcus Efraimsson fa95297e6a docs: update default annotation limit when querying api
Needed due to closing #11569
2018-04-13 10:58:29 +02:00
Marcus Efraimsson 80e4a9dc55 Merge branch 'master' into docs-5.1 2018-04-13 10:56:26 +02:00
Andrzej Ressel bff174dba9 PR comments 2018-04-11 22:59:29 +02:00
Marcus Efraimsson 1232745e89 docs: fix typo of default port for mssql
Fixes #11562
2018-04-11 20:56:16 +02:00
Marcus Efraimsson fe4cfbeb73 Merge branch 'master' into docs-5.1 2018-04-11 20:38:09 +02:00
Sven Klemm 24eafa4537 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-10 14:37:11 +02:00
Daniel Lee d39dac10a6 docs: update after #11531 2018-04-09 15:19:41 +02:00
ryan 5ca972542b convert graphite epoch to ms 2018-04-09 13:58:09 +02:00
ryan 56679ac80f Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  prevent angular from evaluating {{hostname}} in tooltip (#11514)
2018-04-09 13:52:54 +02:00
ryan 60816f5fc2 using millis for annotations too 2018-04-09 12:48:01 +02:00
ryan 39f37ff8aa Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  docs: updated debian distro in install docs to stretch, closes #11527
  css: quick fix after IE11 changes
  fixed sidemenu icon issue created by earlier pr
  changelog: adds note for #11165
  migrated dash_class to ts
  migrated segment_srv to ts
  removed indent for manage dashboards
  created closeDropdown function, renamed appevent, added second appevent for open timepicker
  added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter
  docker: add users and groups to ldap block
  timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view
  bounnd the esc key to exit timepicker
  added indent to dashboards inside folder in search dropdown, and added indent to dashboard icon in search item
2018-04-09 12:31:44 +02:00
Aleksei Magusev 92e5968f91 Fix ResponseParser for InfluxDB to return only string values 2018-04-09 11:52:12 +02:00
Aleksei Magusev a101177b55 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-04-09 11:51:22 +02:00
Penghan Wang fbed72c89c Merge branch 'master' into feature/add_es_alerting 2018-04-09 14:00:28 +08:00
Andrzej Ressel c4b57a2562 Revert files 2018-04-08 20:40:09 +02:00
Andrzej Ressel cfd1f5c072 Revert files 2018-04-08 20:38:08 +02:00
Andrzej Ressel 697a3eaa43 Fix after merge 2018-04-08 20:31:17 +02:00
Andrzej Ressel 30f048965c Merge branch 'master' into feature/discord 2018-04-08 20:09:56 +02:00
Andrzej Ressel dc11f1da81 Make dashboard JSON editable 2018-04-08 20:00:18 +02:00
Sven Klemm 107c0d81d2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-06 17:01:45 +02:00
Marcus Efraimsson 4cc80efee6 graphite: use a query when testing data source
Using a query (POST /render) request instead of GET /metrics/find to better
mimic an actual request for rendering a panel in a dashboard. The POST /render
request will add at least a custom http header which can be problematic when
using direct access mode since it will trigger a CORS prerequest check. By
doing this kind of query when testing the data source possible CORS issues
can be detected there instead of later when trying to use the data source
in a dashboard.
2018-04-05 18:11:35 +02:00
ryan 66d020eb7e skip migration if it is a big number 2018-04-05 09:51:08 +02:00
ryan 392c47f39b Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (51 commits)
  Use curly brackets around hyperlink help text #11478 (#11479)
  migrated playlist-routes to ts
  migrated last all.js to ts
  Notes for closing #7119
  changelog: adds note for #11128
  variables: adds test for variable sorting
  Add case-insensitive sort for variables.
  graphite: fixes #11434
  settings: fixes test
  changed from margin to padding
  changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable
  mssql: typos in help sections
  Webpack Grafana plugin template project to links (#11457)
  rm panel.type  constrain from threshold_mapper.ts (#11448)
  No need for node_modules/bin in npm run-script (#11449)
  changelog: adds note about closing #11555
  add article
  fix some typos
  migrated graph_tooltip to ts
  started migration to ts
  ...
2018-04-05 09:48:00 +02:00
Marcel Anacker 64c16eb912 Alerting: Fixing mobile notifications in Microsoft Teams 2018-04-04 16:28:12 +02:00
Daniel Lee 51b078fb65 docs: spelling 2018-04-03 09:47:53 +02:00
Sven Klemm fa170b3cc6 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-28 20:43:15 +02:00
Patrick Schuster 3091aece2b Add Google Hangouts Chat notifier. 2018-03-28 11:56:54 +02:00
wph95 4050fce220 add response_parser test 2018-03-28 12:35:05 +08:00
Marcus Efraimsson 828dd34507 docs: update table plugin documentation with value/range to text mapping 2018-03-27 20:18:04 +02:00
wph95 06f7332156 cleanup and add more test 2018-03-28 01:42:25 +08:00
Marcus Efraimsson c9cdb4cda0 Merge pull request #11383 from alexanderzobnin/docs-10009
Update heatmap and prometheus docs
2018-03-27 14:01:36 +02:00
Marcus Efraimsson 41ff37f0a1 Merge branch 'master' into docs-5.1 2018-03-27 14:00:16 +02:00
Alexander Zobnin 2c7040c246 docs: prometheus ds, remove "new in v4.3" note 2018-03-27 09:48:19 +03:00
Sven Klemm 8b3c308168 remove categories from queryPart 2018-03-26 20:15:16 +02:00
wph95 4042e4b225 fix a terms bug and add test 2018-03-27 02:12:43 +08:00
Sven Klemm d6ac7aee89 remove unused import 2018-03-26 18:50:03 +02:00
Sven Klemm 6c2ef7dca6 handle aggregate functions more generic 2018-03-26 18:34:40 +02:00
Alexander Zobnin b97cede054 docs: update heatmap and prometheus docs, #10009 2018-03-26 17:12:25 +03:00
Penghan Wang a21afbe9a6 Merge branch 'master' into feature/add_es_alerting 2018-03-26 19:51:03 +08:00
wph95 63a200686e - pipeline aggs support
- add some test
2018-03-26 19:48:57 +08:00
Sven Klemm 12600a0e95 support non-nested menu entries 2018-03-26 13:19:14 +02:00
wph95 d6cdc2497c Handle Interval Date Format similar to the JS variant
https://github.com/grafana/grafana/pull/10343/commits/7e14e272fa37df5b4d412c16845d1e525711f726
2018-03-26 16:13:14 +08:00
wph95 1e275d0cd1 set right series name
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-25 02:18:28 +08:00
ryan 71ef9b6db5 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (26 commits)
  notes about closing #11306
  cleanup
  changelog: unix socket permissions
  Adjust permissions of unix socket
  docs: tweaks
  changelog: adds note about closing #5855
  legend: small refactoring
  Make golint happier
  mysql: skip tests by default
  mssql: update query editor help
  mysql: fix precision for the time column in table/annotation query mode
  postgres: fix precision for the time column in table/annotation query mode
  mssql: fix precision for the time column in table/annotation query mode
  mssql: remove UTC conversion in macro functions
  mssql: fix timeGroup macro so that it properly creates correct groups
  small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under
  fixed so legend right works like legend under on small screens
  Alerting: move getNewState to EvalContext
  graphite: adds more traces for alerting
  sql datasource: extract common logic for converting time column to epoch time in ms
  ...
2018-03-24 11:39:35 +01:00
ryan eabcbcda88 remove README changes 2018-03-24 11:39:20 +01:00
wph95 bc5b59737c finished CODING PHASE 1
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-24 13:06:21 +08:00
wph95 8e7d23cdeb wip
Signed-off-by: wph95 <wph657856467@gmail.com>
2018-03-23 23:50:16 +08:00
Patrick O'Carroll bd7964d549 Merge pull request #11367 from grafana/graph_51_docs
Update graph panel documentation
2018-03-23 16:21:39 +01:00
Penghan Wang fa72c4fea4 Merge pull request #1 from grafana/master
upgrade from grafana/grafana
2018-03-23 23:18:27 +08:00
Marcus Efraimsson 13d0bd5815 Merge branch 'docs-5.1' into graph_51_docs 2018-03-23 15:51:32 +01:00
Marcus Efraimsson 0a487c484d docs: fix typos 2018-03-23 15:49:54 +01:00
Marcus Efraimsson 403c64ab20 docs: update postgres, mysql and mssql documentation
Due to changes closing #11306
2018-03-23 15:48:04 +01:00
Marcus Efraimsson c318f7bb31 Merge branch 'master' into docs-5.1 2018-03-23 15:15:57 +01:00
Marcus Efraimsson 1b8103f0ea docs: update graph panel documentation
Added new versions of images and new images to better highlight the possible
configuration options.
Documentation was very outdated so tried to fix that to better reflect the
current state/latest release.
2018-03-23 14:43:57 +01:00
ryan 7defb1adf5 remove dashboardId check... i can't figure out how the tests work 2018-03-23 12:54:53 +01:00
ryan e92ea79524 get circle to run tests again 2018-03-23 12:48:03 +01:00
ryan 2116152295 add dashboardId to test 2018-03-23 12:35:39 +01:00
ryan a58b4ff2d6 remove api tests 2018-03-23 12:13:38 +01:00
ryan 14b737e662 update CHANGELOG 2018-03-23 12:08:32 +01:00
ryan b39fb7fdd5 fix operator 2018-03-23 12:01:21 +01:00
ryan a0a6fa6fa5 remove constraint from sqlstore 2018-03-23 11:47:07 +01:00
ryan a5588b6957 Merge remote-tracking branch 'origin/annotations-created' into annotations-created
* origin/annotations-created:
  dooh
2018-03-23 11:44:21 +01:00
ryan 4ed1ec5174 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (30 commits)
  changelog: adds note about closing #11278
  docs: spelling
  docs: add intro paragraph to provisioning page
  Cleanup CircleCI V2 Conversion
  changelog: notes for #1271 and #2740
  graph: minor fixes to y-axes alignment feature
  added save icon to save buttons
  removed trash can icon from save buttons
  Return actual user ID in UserProfileDTO
  dashboard version cleanup: more tests and refactor
  minor refactor of dashboard version cleanup
  refactor: dashboard version cleanup
  limit number of rows deleted by dashboard version cleanup
  fix dashboard version cleanup on large datasets
  Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
  Fixed unit test.
  Changed the way this feature was activated. And changed tolltip.
  Added validation of input parameters.
  Resolved conflict
  Corrected work for graphs created before this feature.
  ...
2018-03-23 11:38:43 +01:00
ryan db92a96067 move dashboard error to API (not sql) 2018-03-23 11:36:44 +01:00
Marcus Efraimsson 1d515bb52c Merge branch 'master' into docs-5.1 2018-03-23 10:40:12 +01:00
Ryan McKinley 164ddb16c9 dooh 2018-03-22 20:48:40 +01:00
ryan 0c7294593c update the updated column! 2018-03-22 20:05:04 +01:00
ryan d554c6f9be using circle as my tester 2018-03-22 19:44:47 +01:00
ryan fa021b547a using circle as my tester 2018-03-22 19:39:30 +01:00
ryan db91033b6e adding tests, but they arent running locally 2018-03-22 19:33:33 +01:00
ryan 20353db966 convert epoch to milliseconds 2018-03-22 16:21:47 +01:00
ryan a2bbd89a9e adding updated column 2018-03-22 15:52:09 +01:00
ryan df94b380f4 Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master:
  Make golint happier
2018-03-22 14:59:14 +01:00
ryan 3898ea02e6 adding created column 2018-03-22 02:22:58 +01:00
Daniel Lee fe293718a2 Merge pull request #11310 from grafana/mssql_datasource_docs
docs: Using Microsoft SQL Server in Grafana
2018-03-20 20:39:52 +01:00
Daniel Lee e5df179c7c docs: spelling 2018-03-20 20:38:20 +01:00
Marcus Efraimsson 74c3f732c1 docs: update using mssql in grafana 2018-03-20 10:59:35 +01:00
Sven Klemm 95a5a61337 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-19 20:23:36 +01:00
Marcus Efraimsson 1f8a2a67bf docs: Using Microsoft SQL Server in Grafana 2018-03-19 11:06:10 +01:00
Sven Klemm 8392fe5cd2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-17 16:24:06 +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
Sven Klemm 64fa1ce8a0 properly handle IN queries 2018-03-14 18:09:47 +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
Sven Klemm b7c7030a46 add regex operators 2018-03-13 23:06:39 +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
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
Sven Klemm e780b1bce5 cleanup where segment handling 2018-03-11 12:06:54 +01:00
Sven Klemm 0b358ff5f3 remove limit 2018-03-10 22:39:42 +01:00
Sven Klemm cb5278d413 handle variables in where constraints 2018-03-10 20:18:03 +01:00
Sven Klemm 1d8540ac69 properly quote where constraint parts 2018-03-09 18:18:12 +01:00
Sven Klemm 340f679d0f quote schema and table 2018-03-09 18:09:59 +01:00
Sven Klemm 1849e938bd Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-09 17:30:01 +01:00
Dan Cech abef722265 Fix indent 2018-03-07 14:41:05 -05:00
Sven Klemm e590068082 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-07 18:38:28 +01:00
Sébastien BERNARD 380aa26ea3 Fix the code to match the documentation.
Permit for LDAP groups to be groupofuniquenames composed of uniquename (DN).
For this, propose DN as group_search_filter_user_attribute and DN also for the member_of in the server.attributes section.

DN is processed as a special attribute name which returns the LdapSearchResult.DN field instead of a member of attr array.
2018-03-07 18:14:18 +01:00
Sven Klemm 6b656094fc Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-06 10:43:01 +01:00
Daniel Lee 0e54c474aa Merge branch 'master' into docs-5.1 2018-03-06 09:28:13 +01:00
Daniel Lee 8a1bd2ee22 docs: fill for mysql/postgres
ref #10138
2018-03-06 09:24:36 +01:00
Sven Klemm 83200c289a use metricColumn in query builder 2018-03-04 23:32:23 +01:00
Sven Klemm 6766028d7a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-04 21:40:20 +01:00
Sven Klemm bf4a30d30f set rawSQL when rendering query builder query 2018-03-04 19:46:11 +01:00
Sven Klemm 26e09b598c fix group by column 2018-03-04 19:35:43 +01:00
Sven Klemm e8c6341fed clean up aggregation functions 2018-03-04 10:18:11 +01:00
Sven Klemm 7104e6f9f8 fix variable interpolation 2018-03-03 22:11:51 +01:00
Sven Klemm fd518846b1 rename field to column 2018-03-03 20:57:00 +01:00
Sven Klemm 1a051ce320 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-01 14:40:43 +01:00
Sven Klemm 6c6be9cfc0 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-26 07:50:49 +01:00
Sven Klemm c5de5ed5be Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-21 08:24:04 +01:00
Martin Molnar be2fa54459 feat(ldap): Allow use of DN in user attribute filter (#3132) 2018-02-20 11:15:31 +01:00
Sven Klemm dd2b6c70a2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-08 16:48:12 +01:00
Sven Klemm ef18eb7fcb add where constraint handling 2018-02-08 10:25:32 +01:00
Sven Klemm 3bce45d8a6 add query_builder 2018-02-08 10:19:43 +01:00
Sven Klemm bb68cb6e3c Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-07 20:12:51 +01:00
Sven Klemm 09efcbc205 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-07 15:01:00 +01:00
Sven Klemm 382a525477 make metricColumn functional 2018-02-03 18:26:57 +01:00
Sven Klemm 01a1737ddb Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-02-03 18:06:01 +01:00
Sven Klemm c65a964cdd add metric column selector 2018-02-03 18:03:00 +01:00
Torkel Ödegaard 636cca8332 poc: merge sync 2018-02-02 16:01:01 +01:00
Torkel Ödegaard 5aeded8cf3 Merge branch 'master' into react-panels 2018-02-02 15:47:13 +01:00
Sven Klemm 4dbd83fac1 add groupby to querybuilder
remove unused aggregations
2018-01-31 15:32:32 +01:00
Sven Klemm 571ecdc740 enhance render function 2018-01-30 22:57:38 +01:00
Sven Klemm 443504517a add postgres_query.ts 2018-01-30 22:13:55 +01:00
Sven Klemm 438b10bcd6 query builder changes 2018-01-30 14:10:38 +01:00
Sven Klemm a59e052a0f more query builder components 2018-01-30 14:08:10 +01:00
Sven Klemm 17be31e216 call render in query 2018-01-28 22:16:51 +01:00
Sven Klemm 33ac22bfdb start query builder ui 2018-01-21 22:08:18 +01:00
Craig Miskell 2e86985d44 Remove silly noise 2018-01-05 16:22:49 +13:00
Craig Miskell f9fb315dbd Update tests to match new reality, and rejig the implementation a bit to truly work as desired 2018-01-05 16:20:54 +13:00
Craig Miskell 61e6f63b32 Align queries to prometheus with the step to ensure 'rate' type expressions get consistent results 2018-01-05 09:08:40 +13:00
Torkel Ödegaard 456b4d2a66 poc: began react panel experiments, step2 2018-01-03 13:33:54 +01:00
Torkel Ödegaard 3eb5f23209 poc: began react panel experiments, step2 2018-01-03 13:03:26 +01:00
Torkel Ödegaard 13efc529ec poc: began react panel experiments 2018-01-02 14:52:30 +01:00
Daniel Lee 3a3272e225 annotations: allows template variables to be used in tag filter
When filtering built in annotations by tag, interpolates the tag with
template variables. Fixes #9587
2017-12-12 10:07:33 +01:00
Jeroen Jacobs 5b926cc102 Adding a user in a specified organisation uses the admin API 2017-11-17 12:19:18 +01:00
Andrzej Ressel 1bf982439b Sending image 2017-03-23 21:53:54 +01:00
Andrzej Ressel 5f3b7eaa45 Discord integration 2017-03-22 23:28:55 +01:00
3193 changed files with 287923 additions and 82987 deletions
+11
View File
@@ -0,0 +1,11 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": { "browsers": "last 3 versions" },
"useBuiltIns": "entry"
}
]
]
}
+4 -3
View File
@@ -1,17 +1,18 @@
[run]
init_cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]
watch_all = true
follow_symlinks = true
watch_dirs = [
"$WORKDIR/pkg",
"$WORKDIR/public/views",
"$WORKDIR/conf",
]
watch_exts = [".go", ".ini", ".toml"]
watch_exts = [".go", ".ini", ".toml", ".template.html"]
build_delay = 1500
cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]
+488 -63
View File
@@ -1,6 +1,75 @@
aliases:
# Workflow filters
- &filter-only-release
branches:
ignore: /.*/
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
- &filter-not-release-or-master
tags:
ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
ignore: master
- &filter-only-master
branches:
only: master
version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.11.5
- image: circleci/mysql:5.6-ram
environment:
MYSQL_ROOT_PASSWORD: rootpass
MYSQL_DATABASE: grafana_tests
MYSQL_USER: grafana
MYSQL_PASSWORD: password
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: sudo apt update
- run: sudo apt install -y mysql-client
- run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
- run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
- run:
name: mysql integration tests
command: './scripts/circle-test-mysql.sh'
postgres-integration-test:
docker:
- image: circleci/golang:1.11.5
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
POSTGRES_PASSWORD: grafanatest
POSTGRES_DB: grafanatest
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: sudo apt update
- run: sudo apt install -y postgresql-client
- run: dockerize -wait tcp://127.0.0.1:5432 -timeout 120s
- run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql'
- run:
name: postgres integration tests
command: './scripts/circle-test-postgres.sh'
cache-server-test:
docker:
- image: circleci/golang:1.11.5
- image: circleci/redis:4-alpine
- image: memcached
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: dockerize -wait tcp://127.0.0.1:11211 -timeout 120s
- run: dockerize -wait tcp://127.0.0.1:6379 -timeout 120s
- run:
name: cache server tests
command: './scripts/circle-test-cache-servers.sh'
codespell:
docker:
- image: circleci/python
@@ -19,34 +88,28 @@ jobs:
gometalinter:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11.5
environment:
# we need CGO because of go-sqlite3
CGO_ENABLED: 1
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: install gometalinter tool
command: 'go get -u github.com/alecthomas/gometalinter'
- run:
name: install linters
command: 'gometalinter --install'
- run:
name: run some linters
command: 'gometalinter --vendor --deadline 6m --disable-all --enable=structcheck --enable=unconvert --enable=varcheck ./pkg/...'
name: Gometalinter tests
command: './scripts/gometalinter.sh'
test-frontend:
docker:
- image: circleci/node:6.11.4
- image: circleci/node:8
steps:
- checkout
- run:
name: install yarn
command: 'sudo npm install -g yarn --quiet'
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
# Could we skip this step if the cache has been restored? `[ -d node_modules ] || yarn install ...` should be able to apply to build step as well
- run:
name: yarn install
command: 'yarn install --pure-lockfile --no-progress'
no_output_timeout: 15m
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
@@ -57,7 +120,7 @@ jobs:
test-backend:
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11.5
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -65,12 +128,59 @@ jobs:
name: build backend and run go tests
command: './scripts/circle-test-backend.sh'
build:
build-all:
docker:
- image: grafana/build-container:v0.1
- image: grafana/build-container:1.2.4
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- restore_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
- run:
name: download phantomjs binaries
command: './scripts/build/download-phantomjs.sh'
- save_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
paths:
- /tmp/phantomjs
- run:
name: build and package grafana
command: './scripts/build/build-all.sh'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- run:
name: verify signed packages
command: |
mkdir -p ~/.rpmdb/pubkeys
curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
./scripts/build/verify_signed_packages.sh dist/*.rpm
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Test and build Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test . && go build -o release_publisher .'
- persist_to_workspace:
root: .
paths:
- dist/*
- scripts/*.sh
- scripts/build/release_publisher/release_publisher
- scripts/build/publish.sh
build:
docker:
- image: grafana/build-container:1.2.4
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: build and package grafana
command: './scripts/build/build.sh'
@@ -81,91 +191,406 @@ jobs:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Build Grafana.com publisher
command: 'go build -o scripts/publish scripts/build/publish.go'
name: Test Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test .'
- persist_to_workspace:
root: .
paths:
- dist/grafana*
- scripts/*.sh
- scripts/publish
- dist/*
deploy-master:
grafana-docker-master:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
- run: rm packaging/docker/grafana-latest.linux-*.tar.gz
- run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
- run: cd packaging/docker && ./build-enterprise.sh "master"
grafana-docker-pr:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build.sh "${CIRCLE_SHA1}"
grafana-docker-release:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
- run: rm packaging/docker/grafana-latest.linux-*.tar.gz
- run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
- run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}"
build-enterprise:
docker:
- image: circleci/python:2.7-stretch
- image: grafana/build-container:1.2.4
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: checkout enterprise
command: './scripts/build/prepare-enterprise.sh'
- run:
name: test enterprise
command: 'go test ./pkg/extensions/...'
- run:
name: build and package enterprise
command: './scripts/build/build.sh -enterprise'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: move enterprise packages into their own folder
command: 'mv dist enterprise-dist'
- persist_to_workspace:
root: .
paths:
- enterprise-dist/*
build-all-enterprise:
docker:
- image: grafana/build-container:1.2.4
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: checkout enterprise
command: './scripts/build/prepare-enterprise.sh'
- restore_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
- run:
name: download phantomjs binaries
command: './scripts/build/download-phantomjs.sh'
- save_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
paths:
- /tmp/phantomjs
- run:
name: test enterprise
command: 'go test ./pkg/extensions/...'
- run:
name: build and package grafana
command: './scripts/build/build-all.sh -enterprise'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- run:
name: verify signed packages
command: |
mkdir -p ~/.rpmdb/pubkeys
curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
./scripts/build/verify_signed_packages.sh dist/*.rpm
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: move enterprise packages into their own folder
command: 'mv dist enterprise-dist'
- persist_to_workspace:
root: .
paths:
- enterprise-dist/*
deploy-enterprise-master:
docker:
- image: grafana/grafana-ci-deploy:1.2.1
steps:
- attach_workspace:
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to s3
command: 'aws s3 sync ./dist s3://$BUCKET_NAME/master'
command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/master'
- run:
name: Deploy to grafana.com
command: |
cd enterprise-dist
../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "v$(cat grafana.version)" --nightly
deploy-enterprise-release:
docker:
- image: grafana/grafana-ci-deploy:1.2.1
steps:
- checkout
- attach_workspace:
at: .
- run:
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to s3
command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/release'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/release'
- run:
name: Deploy to Grafana.com
command: './scripts/build/publish.sh --enterprise'
- run:
name: Load GPG private key
command: './scripts/build/load-signing-key.sh'
- run:
name: Update Debian repository
command: './scripts/build/update_repo/update-deb.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
- run:
name: Update RPM repository
command: './scripts/build/update_repo/update-rpm.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
deploy-master:
docker:
- image: grafana/grafana-ci-deploy:1.2.1
steps:
- attach_workspace:
at: .
- run:
name: deploy to s3
command: |
# Also
cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
aws s3 sync ./dist s3://$BUCKET_NAME/master
- run:
name: Trigger Windows build
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
- run:
name: Trigger Docker build
command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}'
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/master'
- run:
name: Publish to Grafana.com
command: './scripts/publish -apiKey ${GRAFANA_COM_API_KEY}'
command: |
rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
rm dist/*latest*
cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
deploy-release:
docker:
- image: circleci/python:2.7-stretch
- image: grafana/grafana-ci-deploy:1.2.1
steps:
- checkout
- attach_workspace:
at: dist
- run:
name: install awscli
command: 'sudo pip install awscli'
at: .
- run:
name: deploy to s3
command: 'aws s3 sync ./dist s3://$BUCKET_NAME/release'
- run:
name: Trigger Windows build
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release'
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: Trigger Docker build
command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}'
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/release'
- run:
name: Deploy to Grafana.com
command: './scripts/build/publish.sh'
- run:
name: Load GPG private key
command: './scripts/build/load-signing-key.sh'
- run:
name: Update Debian repository
command: './scripts/build/update_repo/update-deb.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
- run:
name: Update RPM repository
command: './scripts/build/update_repo/update-rpm.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
store-build-artifacts:
docker:
- image: circleci/node:8
steps:
- attach_workspace:
at: .
- store_artifacts:
path: ./dist
workflows:
version: 2
test-and-build:
build-master:
jobs:
- build-all:
filters: *filter-only-master
- build-all-enterprise:
filters: *filter-only-master
- codespell:
filters:
tags:
only: /.*/
- build:
filters:
tags:
only: /.*/
filters: *filter-only-master
- gometalinter:
filters: *filter-only-master
- test-frontend:
filters:
tags:
only: /.*/
filters: *filter-only-master
- test-backend:
filters:
tags:
only: /.*/
filters: *filter-only-master
- mysql-integration-test:
filters: *filter-only-master
- postgres-integration-test:
filters: *filter-only-master
- deploy-master:
requires:
- build-all
- test-backend
- test-frontend
- build
filters:
branches:
only: master
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
- grafana-docker-master:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
- deploy-enterprise-master:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
- build-all-enterprise
filters: *filter-only-master
release:
jobs:
- build-all:
filters: *filter-only-release
- build-all-enterprise:
filters: *filter-only-release
- codespell:
filters: *filter-only-release
- gometalinter:
filters: *filter-only-release
- test-frontend:
filters: *filter-only-release
- test-backend:
filters: *filter-only-release
- mysql-integration-test:
filters: *filter-only-release
- postgres-integration-test:
filters: *filter-only-release
- deploy-release:
requires:
- build-all
- test-backend
- test-frontend
- build
filters:
branches:
ignore: /.*/
tags:
only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
- deploy-enterprise-release:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
- grafana-docker-release:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
build-branches-and-prs:
jobs:
- build:
filters: *filter-not-release-or-master
- codespell:
filters: *filter-not-release-or-master
- gometalinter:
filters: *filter-not-release-or-master
- test-frontend:
filters: *filter-not-release-or-master
- test-backend:
filters: *filter-not-release-or-master
- mysql-integration-test:
filters: *filter-not-release-or-master
- postgres-integration-test:
filters: *filter-not-release-or-master
- cache-server-test:
filters: *filter-not-release-or-master
- grafana-docker-pr:
requires:
- build
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
- cache-server-test
filters: *filter-not-release-or-master
- store-build-artifacts:
requires:
- build
- test-backend
- test-frontend
- codespell
- gometalinter
- mysql-integration-test
- postgres-integration-test
- cache-server-test
filters: *filter-not-release-or-master
+18
View File
@@ -0,0 +1,18 @@
.awcache
.dockerignore
.git
.gitignore
.github
.vscode
bin
data*
dist
docker
Dockerfile
docs
dump.rdb
node_modules
/local
/tmp
*.yml
*.md
-22
View File
@@ -1,22 +0,0 @@
Follow the setup guide in README.md
### Rebuild frontend assets on source change
```
grunt && grunt watch
```
### Rerun tests on source change
```
grunt karma:dev
```
### Run tests for backend assets before commit
```
test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)' | tee /dev/stderr)"
```
### Run tests for frontend assets before commit
```
npm test
go test -v ./pkg/...
```
-16
View File
@@ -1,16 +0,0 @@
Read before posting:
- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue.
- Checkout FAQ: https://community.grafana.com/c/howto/faq
- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
Please include this information:
### What Grafana version are you using?
### What datasource are you using?
### What OS are you running grafana on?
### What did you do?
### What was the expected result?
### What happened instead?
### If related to metric query / data viz:
### Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.
+27
View File
@@ -0,0 +1,27 @@
---
name: Bug report
about: Report a bug you found when using Grafana
labels: 'type: bug'
---
<!--
Please use this template while reporting a bug and provide as much info as possible.
Questions should be posted to https://community.grafana.com
Use query inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
-->
**What happened**:
**What you expected to happen**:
**How to reproduce it (as minimally and precisely as possible)**:
**Anything else we need to know?**:
**Environment**:
- Grafana version:
- Data source type & version:
- OS Grafana is installed on:
- User OS & Browser:
- Grafana plugins:
- Others:
@@ -0,0 +1,11 @@
---
name: Enhancement request
about: Suggest an enhancement or new feature for the Grafana project
labels: 'type: feature request'
---
<!-- Please only use this template for submitting feature requests -->
**What would you like to be added**:
**Why is this needed**:
+26
View File
@@ -0,0 +1,26 @@
---
name: Accessibility issue
about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all.
labels: 'type: accessibility'
---
<!--
Please only use this template for submitting accessibility issues.
This is a new feature area for Grafana that we want to improve. We have long way to go
to really improve accessibility and would like your help to know where to start.
-->
**Steps to reproduce**:
**Actual Result**:
**Expected Result**
**Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0)
**Environment**:
- Grafana version:
- Data source type & version:
- User OS & Browser:
- Others:
+14
View File
@@ -0,0 +1,14 @@
---
name: Support request
about: 'Question or support request relating to using Grafana'
title: ''
labels: ''
assignees: ''
---
STOP -- PLEASE READ!
GitHub is not the right place for questions and support requests.
Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/)
+26 -3
View File
@@ -1,4 +1,27 @@
* Link the PR to an issue for new features
* Rebase your PR if it gets out of sync with master
<!-- Thanks for sending a pull request! Here are some tips for you:
**REMOVE THE TEXT ABOVE BEFORE CREATING THE PULL REQUEST**
1. If this is your first time, please read our [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide.
2. Ensure you have added or ran the appropriate tests for your PR.
3. If it's a new feature or config option it will need a docs update. Docs are under the docs folder in repo root.
4. If the PR is unfinished, mark it as a draft PR.
5. Rebase your PR if it gets out of sync with master
-->
**What this PR does / why we need it**:
**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #
**Special notes for your reviewer**:
**Release note**:
<!--
If this is a user facing change and should be mentioned in release note add it below. If no, just write "NONE" below.
-->
```release-note
```
+27 -4
View File
@@ -1,11 +1,14 @@
node_modules
npm-debug.log
yarn-error.log
coverage/
.aws-config.json
awsconfig
/.awcache
/dist
/public/build
/public/views/index.html
/public/views/error.html
/emails/dist
/public_gen
/public/vendor/npm
@@ -31,25 +34,34 @@ public/css/*.min.css
*.tmp
.DS_Store
.vscode/
.vs/
/data/*
/bin/*
conf/custom.ini
fig.yml
docker-compose.yml
docker-compose.yaml
devenv/docker-compose.yml
devenv/docker-compose.yaml
/conf/provisioning/**/custom.yaml
/conf/provisioning/**/dev.yaml
/conf/ldap_dev.toml
/conf/ldap_freeipa.toml
profile.cov
/grafana
/local
.notouch
/Makefile.local
/pkg/cmd/grafana-cli/grafana-cli
/pkg/cmd/grafana-server/grafana-server
/pkg/cmd/grafana-server/debug
/pkg/extensions
/public/app/extensions
debug.test
/examples/*/dist
/packaging/**/*.rpm
/packaging/**/*.deb
/packaging/**/*.tar.gz
# Ignore OSX indexing
.DS_Store
@@ -59,5 +71,16 @@ debug.test
/vendor/**/*.yml
/vendor/**/*_test.go
/vendor/**/.editorconfig
/vendor/**/appengine*
*.orig
*.orig
/devenv/bulk-dashboards/*.json
/devenv/bulk_alerting_dashboards/*.json
/scripts/build/release_publisher/release_publisher
*.patch
# Ignoring frontend packages specifics
/packages/**/dist
/packages/**/compiled
/packages/**/.rpt2_cache
-13
View File
@@ -1,13 +0,0 @@
{
"disallowImplicitTypeConversion": ["string"],
"disallowKeywords": ["with"],
"disallowMultipleLineBreaks": true,
"disallowMixedSpacesAndTabs": true,
"disallowTrailingWhitespace": true,
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true,
"validateIndentation": 2
}
-37
View File
@@ -1,37 +0,0 @@
{
"browser": true,
"esversion": 6,
"bitwise":false,
"curly": true,
"eqnull": true,
"strict": false,
"devel": true,
"eqeqeq": true,
"forin": false,
"immed": true,
"supernew": true,
"expr": true,
"indent": 2,
"latedef": false,
"newcap": true,
"noarg": true,
"noempty": true,
"undef": true,
"boss": true,
"trailing": true,
"laxbreak": true,
"laxcomma": true,
"sub": true,
"unused": true,
"maxdepth": 6,
"maxlen": 140,
"globals": {
"System": true,
"Promise": true,
"define": true,
"require": true,
"Chromath": false,
"setImmediate": true
}
}
+9
View File
@@ -0,0 +1,9 @@
.git
.github
dist/
pkg/
node_modules
public/vendor/
vendor/
data/
+640 -15
View File
@@ -1,4 +1,622 @@
# 5.1.0 (unreleased)
# 6.1.0 (unreleased)
# 6.1.0-beta1 (unreleased)
### New Features
* **Prometheus**: adhoc filter support [#8253](https://github.com/grafana/grafana/issues/8253), thx [@mtanda](https://github.com/mtanda)
* **Permissions**: Editors can become admin for dashboards, folders and teams they create. [#15977](https://github.com/grafana/grafana/pull/15977), [@xlson](https://github.com/xlson)
### Minor
* **Auth**: Support listing and revoking auth tokens via API [#15836](https://github.com/grafana/grafana/issues/15836)
* **Alerting**: DingDing notification channel now includes alert values. [#13825](https://github.com/grafana/grafana/pull/13825), [@athurg](https://github.com/athurg)
* **Alerting**: Notification channel http api enhancements. [#16219](https://github.com/grafana/grafana/pull/16219), [@marefr](https://github.com/marefr)
* **CloudWatch**: Update metrics/dimensions list. [#16137](https://github.com/grafana/grafana/pull/16137), [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: Add AWS RDS MaximumUsedTransactionIDs metric [#15077](https://github.com/grafana/grafana/pull/15077), thx [@activeshadow](https://github.com/activeshadow)
* **Cache**: Adds support for using out of proc caching in the backend [#10816](https://github.com/grafana/grafana/issues/10816)
* **Dashboard**: New keyboard shortcut `d l` toggles all Graph legends in a dashboard. [#15770](https://github.com/grafana/grafana/pull/15770), [@jsferrei](https://github.com/jsferrei)
* **Datasource**: Only log connection string in dev environment [#16001](https://github.com/grafana/grafana/issues/16001)
* **DataProxy**: Add custom header (X-Grafana-User) to data source requests with the current username. [#15998](https://github.com/grafana/grafana/pull/15998), [@aocenas](https://github.com/aocenas)
* **DataProxy**: Make it possible to add user details to requests sent to the dataproxy [#6359](https://github.com/grafana/grafana/issues/6359) and [#15931](https://github.com/grafana/grafana/issues/15931)
* **DataProxy**: Adds oauth pass-through option for datasources. [#15205](https://github.com/grafana/grafana/pull/15205), [@seanlaff](https://github.com/seanlaff)
* **Explore**: Hide empty duplicates column in logs viewer. [#15982](https://github.com/grafana/grafana/pull/15982), [@steven-sheehy](https://github.com/steven-sheehy)
* **Explore**: Make it possible to close left pane of split view. [#16155](https://github.com/grafana/grafana/pull/16155), [@dprokop](https://github.com/dprokop)
* **Explore**: Move back / forward with browser buttons now works. [#16150](https://github.com/grafana/grafana/pull/16150), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Update Loki labels when label selector is opened. [#16131](https://github.com/grafana/grafana/pull/16131), [@dprokop](https://github.com/dprokop)
* **Graph Panel**: New options for X-axis Min & Max (for histograms). [#14877](https://github.com/grafana/grafana/pull/14877), [@papagian](https://github.com/papagian)
* **Heatmap**: You can now choose to hide buckets with zero value. [#15934](https://github.com/grafana/grafana/pull/15934), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: `Middle` bucket bound option [#15683](https://github.com/grafana/grafana/issues/15683)
* **Heatmap**: `Reverse order` option for changing order of buckets [#15683](https://github.com/grafana/grafana/issues/15683)
* **Prometheus**: Change alignment of range queries to end before now and not in future. [#16110](https://github.com/grafana/grafana/pull/16110), [@davkal](https://github.com/davkal)
* **Prometheus**: Dedup annotations events with same timestamp . [#16152](https://github.com/grafana/grafana/pull/16152), [@torkelo](https://github.com/torkelo)
* **SQL**: Use default min interval of 1m for all SQL data sources. [#15799](https://github.com/grafana/grafana/pull/15799), [@marefr](https://github.com/marefr)
* **TablePanel**: Column color style now works even after removing columns. [#16227](https://github.com/grafana/grafana/pull/16227), [@torkelo](https://github.com/torkelo)
* **Templating**: Custom variable value now escapes all backslashes properly. [#15980](https://github.com/grafana/grafana/pull/15980), [@srid12](https://github.com/srid12)
* **Templating**: Data source variable now supports multi-value for uses cases that involve repeating panels & rows. [#15914](https://github.com/grafana/grafana/pull/15914), [@torkelo](https://github.com/torkelo)
* **VictorOps**: Adds more information to the victor ops notifiers [#15744](https://github.com/grafana/grafana/issues/15744), thx [@zhulongcheng](https://github.com/zhulongcheng)
### Bug Fixes
* **Alerting**: Don't include non-existing image in MS Teams notifications. [#16116](https://github.com/grafana/grafana/pull/16116), [@SGI495](https://github.com/SGI495)
* **Api**: Invalid org invite code [#10506](https://github.com/grafana/grafana/issues/10506)
* **Annotations**: Fix for native annotations filtered by template variable with pipe. [#15515](https://github.com/grafana/grafana/pull/15515), [@marefr](https://github.com/marefr)
* **Dashboard**: Fix for time regions spanning across midnight. [#16201](https://github.com/grafana/grafana/pull/16201), [@marefr](https://github.com/marefr)
* **Datasource**: Handles nil jsondata field gracefully [#14239](https://github.com/grafana/grafana/issues/14239)
* **Datasource**: Empty user/password was not updated when updating datasources [#15608](https://github.com/grafana/grafana/pull/15608), thx [@Maddin-619](https://github.com/Maddin-619)
* **Elasticsearch**: Fixes using template variables in the alias field. [#16229](https://github.com/grafana/grafana/pull/16229), [@daniellee](https://github.com/daniellee)
* **Elasticsearch**: Fix incorrect index pattern padding in alerting queries. [#15892](https://github.com/grafana/grafana/pull/15892), [@sandlis](https://github.com/sandlis)
* **Explore**: Fix for Prometheus autocomplete not working in Firefox. [#16192](https://github.com/grafana/grafana/pull/16192), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Fix for url does not keep query after browser refresh. [#16189](https://github.com/grafana/grafana/pull/16189), [@hugohaggmark](https://github.com/hugohaggmark)
* **Gauge**: Interpolate scoped variables in repeated gauges [#15739](https://github.com/grafana/grafana/issues/15739)
* **Graphite**: Fixed issue with using series ref and series by tag. [#16111](https://github.com/grafana/grafana/pull/16111), [@torkelo](https://github.com/torkelo)
* **Graphite**: Fixed variable quoting when variable value is nummeric. [#16149](https://github.com/grafana/grafana/pull/16149), [@torkelo](https://github.com/torkelo)
* **Heatmap**: Fixes Y-axis tick labels being in wrong order for some Prometheus queries. [#15932](https://github.com/grafana/grafana/pull/15932), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: Negative values are now displayed correctly in graph & legend. [#15953](https://github.com/grafana/grafana/pull/15953), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: legend shows wrong colors for small values [#14019](https://github.com/grafana/grafana/issues/14019)
* **InfluxDB**: Always close request body even for error status codes. [#16207](https://github.com/grafana/grafana/pull/16207), [@ramongtx](https://github.com/ramongtx)
* **ManageDashboards**: Fix for checkboxes not appearing properly Firefox . [#15981](https://github.com/grafana/grafana/pull/15981), [@srid12](https://github.com/srid12)
* **Playlist**: Leaving playlist now always stops playlist . [#15791](https://github.com/grafana/grafana/pull/15791), [@peterholmberg](https://github.com/peterholmberg)
* **Prometheus**: fixes regex ad-hoc filters variables with wildcards. [#16234](https://github.com/grafana/grafana/pull/16234), [@daniellee](https://github.com/daniellee)
* **TablePanel**: Column color style now works even after removing columns. [#16227](https://github.com/grafana/grafana/pull/16227), [@torkelo](https://github.com/torkelo)
* **TablePanel**: Fix for white text on white background when value is null. [#16199](https://github.com/grafana/grafana/pull/16199), [@peterholmberg](https://github.com/peterholmberg)
# 6.0.2 (2019-03-19)
### Bug Fixes
* **Alerting**: Fixed issue with AlertList panel links resulting in panel not found errors. [#15975](https://github.com/grafana/grafana/pull/15975), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Improved error handling when rendering dashboard panels. [#15970](https://github.com/grafana/grafana/pull/15970), [@torkelo](https://github.com/torkelo)
* **LDAP**: Fix allow anonymous server bind for ldap search. [#15872](https://github.com/grafana/grafana/pull/15872), [@marefr](https://github.com/marefr)
* **Discord**: Fix discord notifier so it doesn't crash when there are no image generated. [#15833](https://github.com/grafana/grafana/pull/15833), [@marefr](https://github.com/marefr)
* **Panel Edit**: Prevent search in VizPicker from stealing focus. [#15802](https://github.com/grafana/grafana/pull/15802), [@peterholmberg](https://github.com/peterholmberg)
* **Datasource admin**: Fixed url of back button in datasource edit page, when root_url configured. [#15759](https://github.com/grafana/grafana/pull/15759), [@dprokop](https://github.com/dprokop)
# 6.0.1 (2019-03-06)
### Bug Fixes
* **Metrics**: Fixes broken usagestats metrics for /metrics [#15651](https://github.com/grafana/grafana/issues/15651)
* **Dashboard**: Fixes kiosk mode should have &kiosk appended to the url [#15765](https://github.com/grafana/grafana/issues/15765)
* **Dashboard**: Fixes kiosk=tv mode with autofitpanels should respect header [#15650](https://github.com/grafana/grafana/issues/15650)
* **Image rendering**: Fixed image rendering issue for dashboards with auto refresh, . [#15818](https://github.com/grafana/grafana/pull/15818), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Fix only users that can edit a dashboard should be able to update panel json. [#15805](https://github.com/grafana/grafana/pull/15805), [@marefr](https://github.com/marefr)
* **LDAP**: fix allow anonymous initial bind for ldap search. [#15803](https://github.com/grafana/grafana/pull/15803), [@marefr](https://github.com/marefr)
* **UX**: Fixed scrollbar not visible initially (only after manual scroll). [#15798](https://github.com/grafana/grafana/pull/15798), [@torkelo](https://github.com/torkelo)
* **Datasource admin** TestData [#15793](https://github.com/grafana/grafana/pull/15793), [@hugohaggmark](https://github.com/hugohaggmark)
* **Dashboard**: Fixed scrolling issue that caused scroll to be locked to bottom. [#15792](https://github.com/grafana/grafana/pull/15792), [@torkelo](https://github.com/torkelo)
* **Explore**: Viewers with viewers_can_edit should be able to access /explore. [#15787](https://github.com/grafana/grafana/pull/15787), [@jschill](https://github.com/jschill)
* **Security** fix: limit access to org admin and alerting pages. [#15761](https://github.com/grafana/grafana/pull/15761), [@marefr](https://github.com/marefr)
* **Panel Edit** minInterval changes did not persist [#15757](https://github.com/grafana/grafana/pull/15757), [@hugohaggmark](https://github.com/hugohaggmark)
* **Teams**: Fixed bug when getting teams for user. [#15595](https://github.com/grafana/grafana/pull/15595), [@hugohaggmark](https://github.com/hugohaggmark)
* **Stackdriver**: fix for float64 bounds for distribution metrics [#14509](https://github.com/grafana/grafana/issues/14509)
* **Stackdriver**: no reducers available for distribution type [#15179](https://github.com/grafana/grafana/issues/15179)
# 6.0.0 stable (2019-02-25)
### Bug Fixes
* **Dashboard**: fixes click after scroll in series override menu [#15621](https://github.com/grafana/grafana/issues/15621)
* **MySQL**: fix mysql query using _interval_ms variable throws error [#14507](https://github.com/grafana/grafana/issues/14507)
# 6.0.0-beta3 (2019-02-19)
### Minor
* **CLI**: Grafana CLI should preserve permissions for backend binaries for Linux and Darwin [#15500](https://github.com/grafana/grafana/issues/15500)
* **Alerting**: Allow image rendering 90 percent of alertTimeout [#15395](https://github.com/grafana/grafana/pull/15395)
### Bug fixes
* **Influxdb**: Add support for alerting on InfluxDB queries that use the non_negative_difference function [#15415](https://github.com/grafana/grafana/issues/15415), thx [@kiran3394](https://github.com/kiran3394)
* **Alerting**: Fix percent_diff calculation when points are nulls [#15443](https://github.com/grafana/grafana/issues/15443), thx [@max-neverov](https://github.com/max-neverov)
* **Alerting**: Fixed handling of alert urls with true flags [#15454](https://github.com/grafana/grafana/issues/15454)
# 6.0.0-beta2 (2019-02-11)
### New Features
* **AzureMonitor**: Enable alerting by converting Azure Monitor API to Go [#14623](https://github.com/grafana/grafana/issues/14623)
### Minor
* **Alerting**: Adds support for images in pushover notifier [#10780](https://github.com/grafana/grafana/issues/10780), thx [@jpenalbae](https://github.com/jpenalbae)
* **Graphite/InfluxDB/OpenTSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges [#15284](https://github.com/grafana/grafana/issues/15284)
* **Stackdriver**: Template variables in filters using globbing format [#15182](https://github.com/grafana/grafana/issues/15182)
* **Cloudwatch**: Add `resource_arns` template variable query function [#8207](https://github.com/grafana/grafana/issues/8207), thx [@jeroenvollenbrock](https://github.com/jeroenvollenbrock)
* **Cloudwatch**: Add AWS/Neptune metrics [#14231](https://github.com/grafana/grafana/issues/14231), thx [@tcpatterson](https://github.com/tcpatterson)
* **Cloudwatch**: Add AWS/EC2/API metrics [#14233](https://github.com/grafana/grafana/issues/14233), thx [@tcpatterson](https://github.com/tcpatterson)
* **Cloudwatch**: Add AWS RDS ServerlessDatabaseCapacity metric [#15265](https://github.com/grafana/grafana/pull/15265), thx [@larsjoergensen](https://github.com/larsjoergensen)
* **MySQL**: Adds datasource SSL CA/client certificates support [#8570](https://github.com/grafana/grafana/issues/8570), thx [@bugficks](https://github.com/bugficks)
* **MSSQL**: Timerange are now passed for template variable queries [#13324](https://github.com/grafana/grafana/issues/13324), thx [@thatsparesh](https://github.com/thatsparesh)
* **Annotations**: Support PATCH verb in annotations http api [#12546](https://github.com/grafana/grafana/issues/12546), thx [@SamuelToh](https://github.com/SamuelToh)
* **Templating**: Add json formatting to variable interpolation [#15291](https://github.com/grafana/grafana/issues/15291), thx [@mtanda](https://github.com/mtanda)
* **Login**: Anonymous usage stats for token auth [#15288](https://github.com/grafana/grafana/issues/15288)
* **AzureMonitor**: improve autocomplete for Log Analytics and App Insights editor [#15131](https://github.com/grafana/grafana/issues/15131)
* **LDAP**: Fix IPA/FreeIPA v4.6.4 does not allow LDAP searches with empty attributes [#14432](https://github.com/grafana/grafana/issues/14432)
* **Provisioning**: Allow testing data sources that were added by config [#12164](https://github.com/grafana/grafana/issues/12164)
* **Security**: Fix CSRF Token validation for POSTs [#1441](https://github.com/grafana/grafana/issues/1441)
### Breaking changes
* **Internal Metrics** Edition has been added to the build_info metric. This will break any Graphite queries using this metric. Edition will be a new label for the Prometheus metric. [#15363](https://github.com/grafana/grafana/pull/15363)
### Bug fixes
* **Gauge**: Fix issue with gauge requests being cancelled [#15366](https://github.com/grafana/grafana/issues/15366)
* **Gauge**: Accept decimal inputs for thresholds [#15372](https://github.com/grafana/grafana/issues/15372)
* **UI**: Fix error caused by named colors that are not part of named colors palette [#15373](https://github.com/grafana/grafana/issues/15373)
* **Search**: Bug pressing special regexp chars in input fields [#12972](https://github.com/grafana/grafana/issues/12972)
* **Permissions**: No need to have edit permissions to be able to "Save as" [#13066](https://github.com/grafana/grafana/issues/13066)
# 6.0.0-beta1 (2019-01-30)
### New Features
* **Alerting**: Adds support for Google Hangouts Chat notifications [#11221](https://github.com/grafana/grafana/issues/11221), thx [@PatrickSchuster](https://github.com/PatrickSchuster)
* **Elasticsearch**: Support bucket script pipeline aggregations [#5968](https://github.com/grafana/grafana/issues/5968)
* **Influxdb**: Add support for time zone (`tz`) clause [#10322](https://github.com/grafana/grafana/issues/10322), thx [@cykl](https://github.com/cykl)
* **Snapshots**: Enable deletion of public snapshot [#14109](https://github.com/grafana/grafana/issues/14109)
* **Provisioning**: Provisioning support for alert notifiers [#10487](https://github.com/grafana/grafana/issues/10487), thx [@pbakulev](https://github.com/pbakulev)
* **Explore**: A whole new way to do ad-hoc metric queries and exploration. Split view in half and compare metrics & logs and much much more. [Read more here](http://docs.grafana.org/features/explore/)
* **Auth**: Replace remember me cookie solution for Grafana's builtin, LDAP and OAuth authentication with a solution based on short-lived tokens [#15303](https://github.com/grafana/grafana/issues/15303)
### Minor
* **Templating**: Built in time range variables `$__from` and `$__to`, [#1909](https://github.com/grafana/grafana/issues/1909)
* **Alerting**: Use separate timeouts for alert evals and notifications [#14701](https://github.com/grafana/grafana/issues/14701), thx [@sharkpc0813](https://github.com/sharkpc0813)
* **Elasticsearch**: Add support for offset in date histogram aggregation [#12653](https://github.com/grafana/grafana/issues/12653), thx [@mattiarossi](https://github.com/mattiarossi)
* **Elasticsearch**: Add support for moving average and derivative using doc count (metric count) [#8843](https://github.com/grafana/grafana/issues/8843) [#11175](https://github.com/grafana/grafana/issues/11175)
* **Elasticsearch**: Add support for template variable interpolation in alias field [#4075](https://github.com/grafana/grafana/issues/4075), thx [@SamuelToh](https://github.com/SamuelToh)
* **Influxdb**: Fix autocomplete of measurements does not escape search string properly [#11503](https://github.com/grafana/grafana/issues/11503), thx [@SamuelToh](https://github.com/SamuelToh)
* **Stackdriver**: Aggregating series returns more than one series [#14581](https://github.com/grafana/grafana/issues/14581) and [#13914](https://github.com/grafana/grafana/issues/13914), thx [@kinok](https://github.com/kinok)
* **Cloudwatch**: Fix Assume Role Arn [#14722](https://github.com/grafana/grafana/issues/14722), thx [@jaken551](https://github.com/jaken551)
* **Postgres/MySQL/MSSQL**: Nanosecond timestamp support (`$__unixEpochNanoFilter`, `$__unixEpochNanoFrom`, `$__unixEpochNanoTo`) [#14711](https://github.com/grafana/grafana/pull/14711), thx [@ander26](https://github.com/ander26)
* **Provisioning**: Fixes bug causing infinite growth in dashboard_version table. [#12864](https://github.com/grafana/grafana/issues/12864)
* **Auth**: Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled [#14246](https://github.com/grafana/grafana/issues/14246), thx [@SilverFire](https://github.com/SilverFire)
* **Admin**: Fix prevent removing last grafana admin permissions [#11067](https://github.com/grafana/grafana/issues/11067), thx [@danielbh](https://github.com/danielbh)
* **Admin**: When multiple user invitations, all links are the same as the first user who was invited [#14483](https://github.com/grafana/grafana/issues/14483)
* **LDAP**: Upgrade go-ldap to v3 [#14548](https://github.com/grafana/grafana/issues/14548)
* **OAuth**: Support OAuth providers that are not RFC6749 compliant [#14562](https://github.com/grafana/grafana/issues/14562), thx [@tdabasinskas](https://github.com/tdabasinskas)
* **Proxy whitelist**: Add CIDR capability to auth_proxy whitelist [#14546](https://github.com/grafana/grafana/issues/14546), thx [@jacobrichard](https://github.com/jacobrichard)
* **Dashboard**: `Min width` changed to `Max per row` for repeating panels. This lets you specify the maximum number of panels to show per row and by that repeated panels will always take up full width of row [#12991](https://github.com/grafana/grafana/pull/12991), thx [@pgiraud](https://github.com/pgiraud)
* **Dashboard**: Retain decimal precision when exporting CSV [#13929](https://github.com/grafana/grafana/issues/13929), thx [@cinaglia](https://github.com/cinaglia)
* **Templating**: Escaping "Custom" template variables [#13754](https://github.com/grafana/grafana/issues/13754), thx [@IntegersOfK](https://github.com/IntegersOfK)
* **Templating**: Add percentencode formatting to variable interpolation to be used mainly for url escaping [#12764](https://github.com/grafana/grafana/issues/12764), thx [@cxcv](https://github.com/cxcv)
* **Units**: Add blood glucose level units mg/dL and mmol/L [#14519](https://github.com/grafana/grafana/issues/14519), thx [@kjedamzik](https://github.com/kjedamzik)
* **Units**: Add Floating Point Operations per Second units [#14558](https://github.com/grafana/grafana/pull/14558), thx [@hahnjo](https://github.com/hahnjo)
* **Table**: Renders epoch string as date if date column style [#14484](https://github.com/grafana/grafana/issues/14484)
* **Dataproxy**: Override incoming Authorization header [#13815](https://github.com/grafana/grafana/issues/13815), thx [@kornholi](https://github.com/kornholi)
* **Dataproxy**: Add global datasource proxy timeout setting [#5699](https://github.com/grafana/grafana/issues/5699), thx [@RangerRick](https://github.com/RangerRick)
* **Database**: Support specifying database host using IPV6 for backend database and sql datasources [#13711](https://github.com/grafana/grafana/issues/13711), thx [@ellisvlad](https://github.com/ellisvlad)
* **Database**: Support defining additonal database connection string args when using `url` property in database settings [#14709](https://github.com/grafana/grafana/pull/14709), thx [@tpetr](https://github.com/tpetr)
* **Stackdriver**: crossSeriesAggregation not being sent with the query [#15129](https://github.com/grafana/grafana/issues/15129), thx [@Legogris](https://github.com/Legogris)
### Bug fixes
* **Search**: Fix for issue with scrolling the "tags filter" dropdown, fixes [#14486](https://github.com/grafana/grafana/issues/14486)
* **Prometheus**: Query for annotation always uses 60s step regardless of dashboard range, fixes [#14795](https://github.com/grafana/grafana/issues/14795)
* **Annotations**: Fix creating annotation when graph panel has no data points position the popup outside viewport [#13765](https://github.com/grafana/grafana/issues/13765), thx [@banjeremy](https://github.com/banjeremy)
* **Piechart/Flot**: Fixes multiple piechart instances with donut bug [#15062](https://github.com/grafana/grafana/pull/15062)
* **Postgres**: Fix default port not added when port not configured [#15189](https://github.com/grafana/grafana/issues/15189)
* **Alerting**: Fixes crash bug when alert notifier folders are missing [#15295](https://github.com/grafana/grafana/issues/15295)
* **Dashboard**: Fix save provisioned dashboard modal [#15219](https://github.com/grafana/grafana/pull/15219)
* **Dashboard**: Fix having a long query in prometheus dashboard query editor blocks 30% of the query field when on OSX and having native scrollbars [#15122](https://github.com/grafana/grafana/issues/15122)
* **Explore**: Fix issue with wrapping on long queries [#15222](https://github.com/grafana/grafana/issues/15222)
* **Explore**: Fix cut & paste adds newline before and after selection [#15223](https://github.com/grafana/grafana/issues/15223)
* **Dataproxy**: Fix global datasource proxy timeout not added to correct http client [#15258](https://github.com/grafana/grafana/issues/15258) [#5699](https://github.com/grafana/grafana/issues/5699)
### Breaking changes
* **Text Panel**: The text panel does no longer by default allow unsantizied HTML. [#4117](https://github.com/grafana/grafana/issues/4117). This means that if you have text panels with scripts tags they will no longer work as before. To enable unsafe javascript execution in text panels enable the settings `disable_sanitize_html` under the section `[panels]` in your Grafana ini file, or set env variable `GF_PANELS_DISABLE_SANITIZE_HTML=true`.
* **Dashboard**: Panel property `minSpan` replaced by `maxPerRow`. Dashboard migration will automatically migrate all dashboard panels using the `minSpan` property to the new `maxPerRow` property [#12991](https://github.com/grafana/grafana/pull/12991)
# 5.4.3 (2019-01-14)
### Tech
* **Docker**: Build and publish docker images for armv7 and arm64 [#14617](https://github.com/grafana/grafana/pull/14617), thx [@johanneswuerbach](https://github.com/johanneswuerbach)
* **Backend**: Upgrade to golang 1.11.4 [#14580](https://github.com/grafana/grafana/issues/14580)
* **MySQL** only update session in mysql database when required [#14540](https://github.com/grafana/grafana/pull/14540)
### Bug fixes
* **Alerting** Invalid frequency causes division by zero in alert scheduler [#14810](https://github.com/grafana/grafana/issues/14810)
* **Dashboard** Dashboard links do not update when time range changes [#14493](https://github.com/grafana/grafana/issues/14493)
* **Limits** Support more than 1000 datasources per org [#13883](https://github.com/grafana/grafana/issues/13883)
* **Backend** fix signed in user for orgId=0 result should return active org id [#14574](https://github.com/grafana/grafana/pull/14574)
* **Provisioning** Adds orgId to user dto for provisioned dashboards [#14678](https://github.com/grafana/grafana/pull/14678)
# 5.4.2 (2018-12-13)
* **Datasource admin**: Fix for issue creating new data source when same name exists [#14467](https://github.com/grafana/grafana/issues/14467)
* **OAuth**: Fix for oauth auto login setting, can now be set using env variable [#14435](https://github.com/grafana/grafana/issues/14435)
* **Dashboard search**: Fix for searching tags in tags filter dropdown.
# 5.4.1 (2018-12-10)
* **Stackdriver**: Fixes issue with data proxy and Authorization header [#14262](https://github.com/grafana/grafana/issues/14262)
* **Units**: fixedUnit for Flow:l/min and mL/min [#14294](https://github.com/grafana/grafana/issues/14294), thx [@flopp999](https://github.com/flopp999).
* **Logging**: Fix for issue where data proxy logged a secret when debug logging was enabled, now redacted. [#14319](https://github.com/grafana/grafana/issues/14319)
* TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Add support for alerting on InfluxDB queries that use the cumulative_sum function. [#14314](https://github.com/grafana/grafana/pull/14314), thx [@nitti](https://github.com/nitti)
* **Plugins**: Panel plugins should no receive the panel-initialized event again as usual.
* **Embedded Graphs**: Iframe graph panels should now work as usual. [#14284](https://github.com/grafana/grafana/issues/14284)
* **Postgres**: Improve PostgreSQL Query Editor if using different Schemas, [#14313](
https://github.com/grafana/grafana/pull/14313)
* **Quotas**: Fixed for updating org & user quotas. [#14347](https://github.com/grafana/grafana/pull/14347), thx [#moznion](https://github.com/moznion)
* **Cloudwatch**: Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate to auto complete list. [#14401](https://github.com/grafana/grafana/pull/14401), thx [@sglajchEG](https://github.com/sglajchEG)
* **Dashboard Search**: Fixed filtering by tag issues.
* **Graph**: Fixed time region issues, [#14425](https://github.com/grafana/grafana/issues/14425), [#14280](https://github.com/grafana/grafana/issues/14280)
* **Graph**: Fixed issue with series color picker popover being placed outside window.
# 5.4.0 (2018-12-03)
* **Cloudwatch**: Fix invalid time range causes segmentation fault [#14150](https://github.com/grafana/grafana/issues/14150)
* **Cloudwatch**: AWS/CodeBuild metrics and dimensions [#14167](https://github.com/grafana/grafana/issues/14167), thx [@mmcoltman](https://github.com/mmcoltman)
* **MySQL**: Fix `$__timeFrom()` and `$__timeTo()` should respect local time zone [#14228](https://github.com/grafana/grafana/issues/14228)
### 5.4.0-beta1 fixes
* **Graph**: Fix legend always visible even if configured to be hidden [#14144](https://github.com/grafana/grafana/issues/14144)
* **Elasticsearch**: Fix regression when using datasource version 6.0+ and alerting [#14175](https://github.com/grafana/grafana/pull/14175)
# 5.4.0-beta1 (2018-11-20)
### New Features
* **Alerting**: Introduce alert debouncing with the `FOR` setting. [#7886](https://github.com/grafana/grafana/issues/7886) & [#6202](https://github.com/grafana/grafana/issues/6202)
* **Alerting**: Option to disable OK alert notifications [#12330](https://github.com/grafana/grafana/issues/12330) & [#6696](https://github.com/grafana/grafana/issues/6696), thx [@davewat](https://github.com/davewat)
* **Postgres/MySQL/MSSQL**: Adds support for configuration of max open/idle connections and connection max lifetime. Also, panels with multiple SQL queries will now be executed concurrently [#11711](https://github.com/grafana/grafana/issues/11711), thx [@connection-reset](https://github.com/connection-reset)
* **MySQL**: Graphical query builder [#13762](https://github.com/grafana/grafana/issues/13762), thx [svenklemm](https://github.com/svenklemm)
* **MySQL**: Support connecting thru Unix socket for MySQL datasource [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro)
* **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669)
* **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550)
* **Graph**: Time regions support enabling highlight of weekdays and/or certain timespans [#5930](https://github.com/grafana/grafana/issues/5930)
* **OAuth**: Automatic redirect to sign-in with OAuth [#11893](https://github.com/grafana/grafana/issues/11893), thx [@Nick-Triller](https://github.com/Nick-Triller)
* **Stackdriver**: Template query editor [#13561](https://github.com/grafana/grafana/issues/13561)
### Minor
* **Security**: Upgrade macaron session package to fix security issue. [#14043](https://github.com/grafana/grafana/pull/14043)
* **Cloudwatch**: Show all available CloudWatch regions [#12308](https://github.com/grafana/grafana/issues/12308), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy)
* **Cloudwatch**: CloudHSM metrics and dimensions [#14129](https://github.com/grafana/grafana/pull/14129), thx [@daktari](https://github.com/daktari)
* **Cloudwatch**: Enable using variables in the stats field [#13810](https://github.com/grafana/grafana/issues/13810), thx [@mtanda](https://github.com/mtanda)
* **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm)
* **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367)
* **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977)
* **Graph**: Render dots when no connecting line can be made [#13605](https://github.com/grafana/grafana/issues/13605), thx [@jsferrei](https://github.com/jsferrei)
* **Table**: Fix CSS alpha background-color applied twice in table cell with link [#13606](https://github.com/grafana/grafana/issues/13606), thx [@grisme](https://github.com/grisme)
* **Singlestat**: Fix XSS in prefix/postfix [#13946](https://github.com/grafana/grafana/issues/13946), thx [@cinaglia](https://github.com/cinaglia)
* **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg)
* **Alerting**: Increaste default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945)
* **Alerting**: More options for the Slack Alert notifier [#13993](https://github.com/grafana/grafana/issues/13993), thx [@andreykaipov](https://github.com/andreykaipov)
* **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **Alerting**: Increase Telegram captions length limit [#13876](https://github.com/grafana/grafana/pull/13876), thx [@skgsergio](https://github.com/skgsergio)
* **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876)
* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
* **OAuth**: Fix Google OAuth relies on email, not google account id [#13924](https://github.com/grafana/grafana/issues/13924), thx [@vinicyusmacedo](https://github.com/vinicyusmacedo)
* **Dashboard**: Toggle legend using keyboard shortcut [#13655](https://github.com/grafana/grafana/issues/13655), thx [@davewat](https://github.com/davewat)
* **Dashboard**: Fix render dashboard row drag handle only in edit mode [#13555](https://github.com/grafana/grafana/issues/13555), thx [@praveensastry](https://github.com/praveensastry)
* **Teams**: Fix cannot select team if not included in initial search [#13425](https://github.com/grafana/grafana/issues/13425)
* **Render**: Support full height screenshots using phantomjs render script [#13352](https://github.com/grafana/grafana/pull/13352), thx [@amuraru](https://github.com/amuraru)
* **HTTP API**: Support retrieving teams by user [#14120](https://github.com/grafana/grafana/pull/14120), thx [@supercharlesliu](https://github.com/supercharlesliu)
* **Metrics**: Add basic authentication to metrics endpoint [#13577](https://github.com/grafana/grafana/issues/13577), thx [@bobmshannon](https://github.com/bobmshannon)
### Breaking changes
* Postgres/MySQL/MSSQL datasources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
# 5.3.4 (2018-11-13)
* **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322)
* **MySQL**: Fix `$__timeFilter()` should respect local time zone [#13769](https://github.com/grafana/grafana/issues/13769)
* **Dashboard**: Fix datasource selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
* **Graph**: Fix table legend height when positioned below graph and using Internet Explorer 11 [#13903](https://github.com/grafana/grafana/issues/13903)
* **Dataproxy**: Drop origin and referer http headers [#13328](https://github.com/grafana/grafana/issues/13328) [#13949](https://github.com/grafana/grafana/issues/13949), thx [@roidelapluie](https://github.com/roidelapluie)
# 5.3.3 (2018-11-13)
### File Exfiltration vulnerability Security fix
See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-6-5-security-update/11961) for details.
# 5.3.2 (2018-10-24)
* **InfluxDB/Graphite/Postgres**: Prevent cross site scripting (XSS) in query editor [#13667](https://github.com/grafana/grafana/issues/13667), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres**: Fix template variables error [#13692](https://github.com/grafana/grafana/issues/13692), thx [@svenklemm](https://github.com/svenklemm)
* **Cloudwatch**: Fix service panic because of race conditions [#13674](https://github.com/grafana/grafana/issues/13674), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: Fix check for invalid percentile statistics [#13633](https://github.com/grafana/grafana/issues/13633), thx [@apalaniuk](https://github.com/apalaniuk)
* **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver datasource response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
* **Stackdriver**: stackdriver user-metrics duplicated response when multiple resource types [#13691](https://github.com/grafana/grafana/issues/13691)
* **Variables**: Fix text box template variable doesn't work properly without a default value [#13666](https://github.com/grafana/grafana/issues/13666)
* **Variables**: Fix variable dependency check when using `${var}` format [#13600](https://github.com/grafana/grafana/issues/13600)
* **Dashboard**: Fix kiosk=1 url parameter should put dashboard in kiosk mode [#13764](https://github.com/grafana/grafana/pull/13764)
* **LDAP**: Fix super admins can also be admins of orgs [#13710](https://github.com/grafana/grafana/issues/13710), thx [@adrien-f](https://github.com/adrien-f)
* **Provisioning**: Fix deleting provisioned dashboard folder should cleanup provisioning meta data [#13280](https://github.com/grafana/grafana/issues/13280)
### Minor
* **Docker**: adds curl back into the docker image for utility. [#13794](https://github.com/grafana/grafana/pull/13794)
# 5.3.1 (2018-10-16)
* **Render**: Fix PhantomJS render of graph panel when legend displayed as table to the right [#13616](https://github.com/grafana/grafana/issues/13616)
* **Stackdriver**: Filter option disappears after removing initial filter [#13607](https://github.com/grafana/grafana/issues/13607)
* **Elasticsearch**: Fix no limit size in terms aggregation for alerting queries [#13172](https://github.com/grafana/grafana/issues/13172), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **InfluxDB**: Fix for annotation issue that caused text to be shown twice [#13553](https://github.com/grafana/grafana/issues/13553)
* **Variables**: Fix nesting variables leads to exception and missing refresh [#13628](https://github.com/grafana/grafana/issues/13628)
* **Variables**: Prometheus: Single letter labels are not supported [#13641](https://github.com/grafana/grafana/issues/13641), thx [@olshansky](https://github.com/olshansky)
* **Graph**: Fix graph time formatting for Last 24h ranges [#13650](https://github.com/grafana/grafana/issues/13650)
* **Playlist**: Fix cannot add dashboards with long names to playlist [#13464](https://github.com/grafana/grafana/issues/13464), thx [@neufeldtech](https://github.com/neufeldtech)
* **HTTP API**: Fix /api/org/users so that query and limit querystrings works
# 5.3.0 (2018-10-10)
* **Stackdriver**: Filter wildcards and regex matching are not yet supported [#13495](https://github.com/grafana/grafana/issues/13495)
* **Stackdriver**: Support the distribution metric type for heatmaps [#13559](https://github.com/grafana/grafana/issues/13559)
* **Cloudwatch**: Automatically set graph yaxis unit [#13575](https://github.com/grafana/grafana/issues/13575), thx [@mtanda](https://github.com/mtanda)
# 5.3.0-beta3 (2018-10-03)
* **Stackdriver**: Fix for missing ngInject [#13511](https://github.com/grafana/grafana/pull/13511)
* **Permissions**: Fix for broken permissions selector [#13507](https://github.com/grafana/grafana/issues/13507)
* **Alerting**: Alert reminders deduping not working as expected when running multiple Grafana instances [#13492](https://github.com/grafana/grafana/issues/13492)
# 5.3.0-beta2 (2018-10-01)
### New Features
* **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
* **Stackdriver**: Support for Google Stackdriver Datasource [#13289](https://github.com/grafana/grafana/pull/13289)
### Minor
* **Provisioning**: Dashboard Provisioning now support symlinks that changes target [#12534](https://github.com/grafana/grafana/issues/12534), thx [@auhlig](https://github.com/auhlig)
* **OAuth**: Allow oauth email attribute name to be configurable [#12986](https://github.com/grafana/grafana/issues/12986), thx [@bobmshannon](https://github.com/bobmshannon)
* **Tags**: Default sort order for GetDashboardTags [#11681](https://github.com/grafana/grafana/pull/11681), thx [@Jonnymcc](https://github.com/Jonnymcc)
* **Prometheus**: Label completion queries respect dashboard time range [#12251](https://github.com/grafana/grafana/pull/12251), thx [@mtanda](https://github.com/mtanda)
* **Prometheus**: Allow to display annotations based on Prometheus series value [#10159](https://github.com/grafana/grafana/issues/10159), thx [@mtanda](https://github.com/mtanda)
* **Prometheus**: Adhoc-filtering for Prometheus dashboards [#13212](https://github.com/grafana/grafana/issues/13212)
* **Singlestat**: Fix gauge display accuracy for percents [#13270](https://github.com/grafana/grafana/issues/13270), thx [@tianon](https://github.com/tianon)
* **Dashboard**: Prevent auto refresh from starting when loading dashboard with absolute time range [#12030](https://github.com/grafana/grafana/issues/12030)
* **Templating**: New templating variable type `Text box` that allows free text input [#3173](https://github.com/grafana/grafana/issues/3173)
* **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
* **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
* **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
* **Postgres/MySQL/MSSQL**: Add support for replacing $__interval and $__interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
# 5.3.0-beta1 (2018-09-06)
### New Major Features
* **Alerting**: Notification reminders [#7330](https://github.com/grafana/grafana/issues/7330), thx [@jbaublitz](https://github.com/jbaublitz)
* **Dashboard**: TV & Kiosk mode changes, new cycle view mode button in dashboard toolbar [#13025](https://github.com/grafana/grafana/pull/13025)
* **OAuth**: Gitlab OAuth with support for filter by groups [#5623](https://github.com/grafana/grafana/issues/5623), thx [@BenoitKnecht](https://github.com/BenoitKnecht)
* **Postgres**: Graphical query builder [#10095](https://github.com/grafana/grafana/issues/10095), thx [svenklemm](https://github.com/svenklemm)
### New Features
* **LDAP**: Define Grafana Admin permission in ldap group mappings [#2469](https://github.com/grafana/grafana/issues/2496), PR [#12622](https://github.com/grafana/grafana/issues/12622)
* **LDAP**: Client certificates support [#12805](https://github.com/grafana/grafana/issues/12805), thx [@nyxi](https://github.com/nyxi)
* **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
* **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
* **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
* **CloudWatch**: GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
* **Postgres**: TimescaleDB support, e.g. use `time_bucket` for grouping by time when option enabled [#12680](https://github.com/grafana/grafana/pull/12680), thx [svenklemm](https://github.com/svenklemm)
* **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)
### Minor
* **Alerting**: Its now possible to configure the default value for how to handle errors and no data in alerting. [#10424](https://github.com/grafana/grafana/issues/10424)
* **Alerting**: Fix diff and percent_diff reducers [#11563](https://github.com/grafana/grafana/issues/11563), thx [@jessetane](https://github.com/jessetane)
* **Alerting**: Fix rendering timeout which could cause notifications to not be sent due to rendering timing out [#12151](https://github.com/grafana/grafana/issues/12151)
* **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
* **Provisioning**: Should allow one default datasource per organization [#12229](https://github.com/grafana/grafana/issues/12229)
* **Github OAuth**: Allow changes of user info at Github to be synched to Grafana when signing in [#11818](https://github.com/grafana/grafana/issues/11818), thx [@rwaweber](https://github.com/rwaweber)
* **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
* **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
* **Prometheus**: Add $__interval, $__interval_ms, $__range, $__range_s & $__range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
* **Elasticsearch**: For alerting/backend, support having index name to the right of pattern in index pattern [#12731](https://github.com/grafana/grafana/issues/12731)
* **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
* **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
* **Postgres/MySQL/MSSQL**: New $__unixEpochGroup and $__unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Add previous fill mode to $__timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use floor rounding in $__timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: New $__timeGroupAlias macro. Postgres $__timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres/MySQL/MSSQL**: Escape single quotes in variables [#12785](https://github.com/grafana/grafana/issues/12785), thx [@eMerzh](https://github.com/eMerzh)
* **Postgres/MySQL/MSSQL**: Min time interval support [#13157](https://github.com/grafana/grafana/issues/13157), thx [@svenklemm](https://github.com/svenklemm)
* **MySQL/MSSQL**: Use datetime format instead of epoch for $__timeFilter, $__timeFrom and $__timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
* **Postgres**: Escape ssl mode parameter in connectionstring [#12644](https://github.com/grafana/grafana/issues/12644), thx [@yogyrahmawan](https://github.com/yogyrahmawan)
* **Cloudwatch**: Improved error handling [#12489](https://github.com/grafana/grafana/issues/12489), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: AppSync metrics and dimensions [#12300](https://github.com/grafana/grafana/issues/12300), thx [@franciscocpg](https://github.com/franciscocpg)
* **Cloudwatch**: Direct Connect metrics and dimensions [#12762](https://github.com/grafana/grafana/pulls/12762), thx [@mindriot88](https://github.com/mindriot88)
* **Cloudwatch**: Added BurstBalance metric to list of AWS RDS metrics [#12561](https://github.com/grafana/grafana/pulls/12561), thx [@activeshadow](https://github.com/activeshadow)
* **Cloudwatch**: Add new Redshift metrics and dimensions [#12063](https://github.com/grafana/grafana/pulls/12063), thx [@A21z](https://github.com/A21z)
* **Dashboard**: Fix selecting current dashboard from search should not reload dashboard [#12248](https://github.com/grafana/grafana/issues/12248)
* **Dashboard**: Use uid when linking to dashboards internally in a dashboard [#10705](https://github.com/grafana/grafana/issues/10705)
* **Graph**: Option to hide series from tooltip [#3341](https://github.com/grafana/grafana/issues/3341), thx [@mtanda](https://github.com/mtanda)
* **Singlestat**: Make colorization of prefix and postfix optional in singlestat [#11892](https://github.com/grafana/grafana/pull/11892), thx [@ApsOps](https://github.com/ApsOps)
* **Table**: Adjust header contrast for the light theme [#12668](https://github.com/grafana/grafana/issues/12668)
* **Table**: Fix link color when using light theme and thresholds in use [#12766](https://github.com/grafana/grafana/issues/12766)
* **Table**: Fix for useless horizontal scrollbar for table panel [#9964](https://github.com/grafana/grafana/issues/9964)
* **Table**: Make table sorting stable when null values exist [#12362](https://github.com/grafana/grafana/pull/12362), thx [@bz2](https://github.com/bz2)
* **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
* **Datasource**: Fix UI issue with secret fields after updating datasource [#11270](https://github.com/grafana/grafana/issues/11270)
* **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
* **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
* **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
* **Variables**: Support variables in query variable `Custom all value` field [#12965](https://github.com/grafana/grafana/issues/12965), thx [@franciscocpg](https://github.com/franciscocpg)
* **Units**: Change units to include characters for power of 2 and 3 [#12744](https://github.com/grafana/grafana/pull/12744), thx [@Worty](https://github.com/Worty)
* **Units**: Polish złoty currency [#12691](https://github.com/grafana/grafana/pull/12691), thx [@mwegrzynek](https://github.com/mwegrzynek)
* **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
* **Api**: Delete nonexistent datasource should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
* **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
* **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
* **UI**: Fix iOS home screen "app" icon and Windows 10 app experience [#12752](https://github.com/grafana/grafana/issues/12752), thx [@andig](https://github.com/andig)
* **Plugins**: Convert URL-like text to links in plugins readme [#12843](https://github.com/grafana/grafana/pull/12843), thx [pgiraud](https://github.com/pgiraud)
### Breaking changes
* Postgres datasource no longer automatically adds time column alias when using the $__timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
* Kiosk mode now also hides submenu (variables)
* ?inactive url parameter no longer supported, replaced with kiosk=tv url parameter
### New experimental features
These are new features that's still being worked on and are in an experimental phase. We encourage users to try these out and provide any feedback in related issue.
* **Dashboard**: Auto fit dashboard panels to optimize space used for current TV / Monitor [#12768](https://github.com/grafana/grafana/issues/12768)
### Tech
* **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
* **Backend**: Upgrade to golang 1.11 [#13030](https://github.com/grafana/grafana/issues/13030)
# 5.2.4 (2018-09-07)
* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
# 5.2.3 (2018-08-29)
### Important fix for LDAP & OAuth login vulnerability
See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
# 5.2.2 (2018-07-25)
### Minor
* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
* **Dashboard**: Dashboard links not updated when changing variables [#12506](https://github.com/grafana/grafana/issues/12506)
* **Postgres/MySQL/MSSQL**: Fix connection leak [#12636](https://github.com/grafana/grafana/issues/12636) [#9827](https://github.com/grafana/grafana/issues/9827)
* **Plugins**: Fix loading of external plugins [#12551](https://github.com/grafana/grafana/issues/12551)
* **Dashboard**: Remove unwanted scrollbars in embedded panels [#12589](https://github.com/grafana/grafana/issues/12589)
* **Prometheus**: Prevent error using $__interval_ms in query [#12533](https://github.com/grafana/grafana/pull/12533), thx [@mtanda](https://github.com/mtanda)
# 5.2.1 (2018-06-29)
### Minor
* **Auth Proxy**: Important security fix for whitelist of IP address feature [#12444](https://github.com/grafana/grafana/pull/12444)
* **UI**: Fix - Grafana footer overlapping page [#12430](https://github.com/grafana/grafana/issues/12430)
* **Logging**: Errors should be reported before crashing [#12438](https://github.com/grafana/grafana/issues/12438)
# 5.2.0-stable (2018-06-27)
### Minor
* **Plugins**: Handle errors correctly when loading datasource plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
* **Render**: Enhance error message if phantomjs executable is not found [#11868](https://github.com/grafana/grafana/issues/11868)
* **Dashboard**: Set correct text in drop down when variable is present in url [#11968](https://github.com/grafana/grafana/issues/11968)
### 5.2.0-beta3 fixes
* **LDAP**: Handle "dn" ldap attribute more gracefully [#12385](https://github.com/grafana/grafana/pull/12385), reverts [#10970](https://github.com/grafana/grafana/pull/10970)
# 5.2.0-beta3 (2018-06-21)
### Minor
* **Build**: All rpm packages should be signed [#12359](https://github.com/grafana/grafana/issues/12359)
# 5.2.0-beta2 (2018-06-20)
### New Features
* **Dashboard**: Import dashboard to folder [#10796](https://github.com/grafana/grafana/issues/10796)
### Minor
* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
* **Dashboard**: Fix so panel titles doesn't wrap [#11074](https://github.com/grafana/grafana/issues/11074)
* **Dashboard**: Prevent double-click when saving dashboard [#11963](https://github.com/grafana/grafana/issues/11963)
* **Dashboard**: AutoFocus the add-panel search filter [#12189](https://github.com/grafana/grafana/pull/12189) thx [@ryantxu](https://github.com/ryantxu)
* **Units**: W/m2 (energy), l/h (flow) and kPa (pressure) [#11233](https://github.com/grafana/grafana/pull/11233), thx [@flopp999](https://github.com/flopp999)
* **Units**: Liter/min (flow) and milliLiter/min (flow) [#12282](https://github.com/grafana/grafana/pull/12282), thx [@flopp999](https://github.com/flopp999)
* **Alerting**: Fix mobile notifications for Microsoft Teams alert notifier [#11484](https://github.com/grafana/grafana/pull/11484), thx [@manacker](https://github.com/manacker)
* **Influxdb**: Add support for mode function [#12286](https://github.com/grafana/grafana/issues/12286)
* **Cloudwatch**: Fixes panic caused by bad timerange settings [#12199](https://github.com/grafana/grafana/issues/12199)
* **Auth Proxy**: Whitelist proxy IP address instead of client IP address [#10707](https://github.com/grafana/grafana/issues/10707)
* **User Management**: Make sure that a user always has a current org assigned [#11076](https://github.com/grafana/grafana/issues/11076)
* **Snapshots**: Fix: annotations not properly extracted leading to incorrect rendering of annotations [#12278](https://github.com/grafana/grafana/issues/12278)
* **LDAP**: Allow use of DN in group_search_filter_user_attribute and member_of [#3132](https://github.com/grafana/grafana/issues/3132), thx [@mmolnar](https://github.com/mmolnar)
* **Graph**: Fix legend decimals precision calculation [#11792](https://github.com/grafana/grafana/issues/11792)
* **Dashboard**: Make sure to process panels in collapsed rows when exporting dashboard [#12256](https://github.com/grafana/grafana/issues/12256)
### 5.2.0-beta1 fixes
* **Dashboard**: Dashboard link doesn't work when "As dropdown" option is checked [#12315](https://github.com/grafana/grafana/issues/12315)
* **Dashboard**: Fix regressions after save modal changes, including adhoc template issues [#12240](https://github.com/grafana/grafana/issues/12240)
* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
# 5.2.0-beta1 (2018-06-05)
### New Features
* **Elasticsearch**: Alerting support [#5893](https://github.com/grafana/grafana/issues/5893), thx [@WPH95](https://github.com/WPH95)
* **Build**: Crosscompile and packages Grafana on arm, windows, linux and darwin [#11920](https://github.com/grafana/grafana/pull/11920), thx [@fg2it](https://github.com/fg2it)
* **Login**: Change admin password after first login [#11882](https://github.com/grafana/grafana/issues/11882)
* **Alert list panel**: Updated to support filtering alerts by name, dashboard title, folder, tags [#11500](https://github.com/grafana/grafana/issues/11500), [#8168](https://github.com/grafana/grafana/issues/8168), [#6541](https://github.com/grafana/grafana/issues/6541)
### Minor
* **Dashboard**: Modified time range and variables are now not saved by default [#10748](https://github.com/grafana/grafana/issues/10748), [#8805](https://github.com/grafana/grafana/issues/8805)
* **Graph**: Show invisible highest value bucket in histogram [#11498](https://github.com/grafana/grafana/issues/11498)
* **Dashboard**: Enable "Save As..." if user has edit permission [#11625](https://github.com/grafana/grafana/issues/11625)
* **Prometheus**: Query dates are now step-aligned [#10434](https://github.com/grafana/grafana/pull/10434)
* **Prometheus**: Table columns order now changes when rearrange queries [#11690](https://github.com/grafana/grafana/issues/11690), thx [@mtanda](https://github.com/mtanda)
* **Variables**: Fix variable interpolation when using multiple formatting types [#11800](https://github.com/grafana/grafana/issues/11800), thx [@svenklemm](https://github.com/svenklemm)
* **Dashboard**: Fix date selector styling for dark/light theme in time picker control [#11616](https://github.com/grafana/grafana/issues/11616)
* **Discord**: Alert notification channel type for Discord, [#7964](https://github.com/grafana/grafana/issues/7964) thx [@jereksel](https://github.com/jereksel),
* **InfluxDB**: Support SELECT queries in templating query, [#5013](https://github.com/grafana/grafana/issues/5013)
* **InfluxDB**: Support count distinct aggregation [#11645](https://github.com/grafana/grafana/issues/11645), thx [@kichristensen](https://github.com/kichristensen)
* **Dashboard**: JSON Model under dashboard settings can now be updated & changes saved, [#1429](https://github.com/grafana/grafana/issues/1429), thx [@jereksel](https://github.com/jereksel)
* **Security**: Fix XSS vulnerabilities in dashboard links [#11813](https://github.com/grafana/grafana/pull/11813)
* **Singlestat**: Fix "time of last point" shows local time when dashboard timezone set to UTC [#10338](https://github.com/grafana/grafana/issues/10338)
* **Prometheus**: Add support for passing timeout parameter to Prometheus [#11788](https://github.com/grafana/grafana/pull/11788), thx [@mtanda](https://github.com/mtanda)
* **Login**: Add optional option sign out url for generic oauth [#9847](https://github.com/grafana/grafana/issues/9847), thx [@roidelapluie](https://github.com/roidelapluie)
* **Login**: Use proxy server from environment variable if available [#9703](https://github.com/grafana/grafana/issues/9703), thx [@iyeonok](https://github.com/iyeonok)
* **Invite users**: Friendlier error message when smtp is not configured [#12087](https://github.com/grafana/grafana/issues/12087), thx [@thurt](https://github.com/thurt)
* **Graphite**: Don't send distributed tracing headers when using direct/browser access mode [#11494](https://github.com/grafana/grafana/issues/11494)
* **Sidenav**: Show create dashboard link for viewers if at least editor in one folder [#11858](https://github.com/grafana/grafana/issues/11858)
* **SQL**: Second epochs are now correctly converted to ms. [#12085](https://github.com/grafana/grafana/pull/12085)
* **Singlestat**: Fix singlestat threshold tooltip [#11971](https://github.com/grafana/grafana/issues/11971)
* **Dashboard**: Hide grid controls in fullscreen/low-activity views [#11771](https://github.com/grafana/grafana/issues/11771)
* **Dashboard**: Validate uid when importing dashboards [#11515](https://github.com/grafana/grafana/issues/11515)
* **Docker**: Support for env variables ending with _FILE [grafana-docker #166](https://github.com/grafana/grafana-docker/pull/166), thx [@efrecon](https://github.com/efrecon)
* **Alert list panel**: Show alerts for user with viewer role [#11167](https://github.com/grafana/grafana/issues/11167)
* **Provisioning**: Verify checksum of dashboards before updating to reduce load on database [#11670](https://github.com/grafana/grafana/issues/11670)
* **Provisioning**: Support symlinked files in dashboard provisioning config files [#11958](https://github.com/grafana/grafana/issues/11958)
* **Dashboard list panel**: Search dashboards by folder [#11525](https://github.com/grafana/grafana/issues/11525)
* **Sidenav**: Always show server admin link in sidenav if grafana admin [#11657](https://github.com/grafana/grafana/issues/11657)
# 5.1.5 (2018-06-27)
* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
# 5.1.4 (2018-06-19)
* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
# 5.1.3 (2018-05-16)
* **Scroll**: Graph panel / legend texts shifts on the left each time we move scrollbar on firefox [#11830](https://github.com/grafana/grafana/issues/11830)
# 5.1.2 (2018-05-09)
* **Database**: Fix MySql migration issue [#11862](https://github.com/grafana/grafana/issues/11862)
* **Google Analytics**: Enable Google Analytics anonymizeIP setting for GDPR [#11656](https://github.com/grafana/grafana/pull/11656)
# 5.1.1 (2018-05-07)
* **LDAP**: LDAP login with MariaDB/MySQL database and dn>100 chars not possible [#11754](https://github.com/grafana/grafana/issues/11754)
* **Build**: AppVeyor Windows build missing version and commit info [#11758](https://github.com/grafana/grafana/issues/11758)
* **Scroll**: Scroll can't start in graphs on Chrome mobile [#11710](https://github.com/grafana/grafana/issues/11710)
* **Units**: Revert renaming of unit key ppm [#11743](https://github.com/grafana/grafana/issues/11743)
# 5.1.0 (2018-04-26)
* **Folders**: Default permissions on folder are not shown as inherited in its dashboards [#11668](https://github.com/grafana/grafana/issues/11668)
* **Templating**: Allow more than 20 previews when creating a variable [#11508](https://github.com/grafana/grafana/issues/11508)
* **Dashboard**: Row edit icon not shown [#11466](https://github.com/grafana/grafana/issues/11466)
* **SQL**: Unsupported data types for value column using time series query [#11703](https://github.com/grafana/grafana/issues/11703)
* **Prometheus**: Prometheus query inspector expands to be very large on autocomplete queries [#11673](https://github.com/grafana/grafana/issues/11673)
# 5.1.0-beta1 (2018-04-20)
* **MSSQL**: New Microsoft SQL Server data source [#10093](https://github.com/grafana/grafana/pull/10093), [#11298](https://github.com/grafana/grafana/pull/11298), thx [@linuxchips](https://github.com/linuxchips)
* **Prometheus**: The heatmap panel now support Prometheus histograms [#10009](https://github.com/grafana/grafana/issues/10009)
@@ -43,20 +661,20 @@
* **Units**: Use B/s instead Bps for Bytes per second [#9342](https://github.com/grafana/grafana/pull/9342), thx [@mayli](https://github.com/mayli)
* **Units**: Radiation units [#11001](https://github.com/grafana/grafana/issues/11001), thx [@victorclaessen](https://github.com/victorclaessen)
* **Units**: Timeticks unit [#11183](https://github.com/grafana/grafana/pull/11183), thx [@jtyr](https://github.com/jtyr)
* **Units**: Concentration units and "Normal cubic metre" [#11211](https://github.com/grafana/grafana/issues/11211), thx [@flopp999](https://github.com/flopp999)
* **Units**: Concentration units and "Normal cubic meter" [#11211](https://github.com/grafana/grafana/issues/11211), thx [@flopp999](https://github.com/flopp999)
* **Units**: New currency - Czech koruna [#11384](https://github.com/grafana/grafana/pull/11384), thx [@Rohlik](https://github.com/Rohlik)
* **Avatar**: Fix DISABLE_GRAVATAR option [#11095](https://github.com/grafana/grafana/issues/11095)
* **Heatmap**: Disable log scale when using time time series buckets [#10792](https://github.com/grafana/grafana/issues/10792)
* **Provisioning**: Remove `id` from json when provisioning dashboards, [#11138](https://github.com/grafana/grafana/issues/11138)
* **Prometheus**: tooltip for legend format not showing properly [#11516](https://github.com/grafana/grafana/issues/11516), thx [@svenklemm](https://github.com/svenklemm)
* **Playlist**: Empty playlists cannot be deleted [#11133](https://github.com/grafana/grafana/issues/11133), thx [@kichristensen](https://github.com/kichristensen)
* **Prometheus**: tooltip for legend format not showing properly [#11516](https://github.com/grafana/grafana/issues/11516), thx [@svenklemm](https://github.com/svenklemm)
* **Playlist**: Empty playlists cannot be deleted [#11133](https://github.com/grafana/grafana/issues/11133), thx [@kichristensen](https://github.com/kichristensen)
* **Switch Orgs**: Alphabetic order in Switch Organization modal [#11556](https://github.com/grafana/grafana/issues/11556)
* **Postgres**: improve `$__timeFilter` macro [#11578](https://github.com/grafana/grafana/issues/11578), thx [@svenklemm](https://github.com/svenklemm)
* **Permission list**: Improved ux [#10747](https://github.com/grafana/grafana/issues/10747)
* **Dashboard**: Sizing and positioning of settings menu icons [#11572](https://github.com/grafana/grafana/pull/11572)
* **Dashboard**: Add search filter/tabs to new panel control [#10427](https://github.com/grafana/grafana/issues/10427)
* **Folders**: User with org viewer role should not be able to save/move dashboards in/to general folder [#11553](https://github.com/grafana/grafana/issues/11553)
* **Influxdb**: Dont assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
* **Influxdb**: Don't assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
### Tech
* Backend code simplification [#11613](https://github.com/grafana/grafana/pull/11613), thx [@knweiss](https://github.com/knweiss)
@@ -226,6 +844,12 @@ The following properties have been deprecated and will be removed in a future re
- `uri` property in `GET /api/search` -> Use new `url` or `uid` property instead
- `meta.slug` property in `GET /api/dashboards/uid/:uid` and `GET /api/dashboards/db/:slug` -> Use new `meta.url` or `dashboard.uid` property instead
# 4.6.4 (2018-08-29)
### Important fix for LDAP & OAuth login vulnerability
See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
# 4.6.3 (2017-12-14)
## Fixes
@@ -237,7 +861,7 @@ The following properties have been deprecated and will be removed in a future re
# 4.6.2 (2017-11-16)
## Important
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if your using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if you're using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
## Fixes
* **Color picker**: Bug after using textbox input field to change/paste color string [#9769](https://github.com/grafana/grafana/issues/9769)
@@ -354,7 +978,7 @@ The following properties have been deprecated and will be removed in a future re
## Enhancements
* **GitHub OAuth**: Support for GitHub organizations with 100+ teams. [#8846](https://github.com/grafana/grafana/issues/8846), thx [@skwashd](https://github.com/skwashd)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboad time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboard time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Added new graphite 1.0 functions, available if you set version to 1.0.x in data source settings. New Functions: mapSeries, reduceSeries, isNonNull, groupByNodes, offsetToZero, grep, weightedAverage, removeEmptySeries, aggregateLine, averageOutsidePercentile, delay, exponentialMovingAverage, fallbackSeries, integralByInterval, interpolate, invert, linearRegression, movingMin, movingMax, movingSum, multiplySeriesWithWildcards, pow, powSeries, removeBetweenPercentile, squareRoot, timeSlice, closes [#8261](https://github.com/grafana/grafana/issues/8261)
- **Elasticsearch**: Ad-hoc filters now use query phrase match filters instead of term filters, works on non keyword/raw fields [#9095](https://github.com/grafana/grafana/issues/9095).
@@ -519,7 +1143,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **InfluxDB**: Influxb Datasource test passes even if the Database doesn't exist [#7864](https://github.com/grafana/grafana/issues/7864)
* **Prometheus**: Displaying Prometheus annotations is incredibly slow [#7750](https://github.com/grafana/grafana/issues/7750), thx [@mtanda](https://github.com/mtanda)
* **Graphite**: grafana generates empty find query to graphite -> 422 Unprocessable Entity [#7740](https://github.com/grafana/grafana/issues/7740)
* **Admin**: make organisation filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
* **Admin**: make organization filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
## Changes
* **Elasticsearch**: Changed elasticsearch Terms aggregation to default to Min Doc Count to 1, and sort order to Top [#8321](https://github.com/grafana/grafana/issues/8321)
@@ -537,7 +1161,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **Docs**: Added some details about Sessions in Postgres [#7694](https://github.com/grafana/grafana/pull/7694) thx [@rickard-von-essen](https://github.com/rickard-von-essen)
* **Influxdb**: Allow commas in template variables [#7681](https://github.com/grafana/grafana/issues/7681) thx [@thuck](https://github.com/thuck)
* **Cloudwatch**: stop using deprecated session.New() [#7736](https://github.com/grafana/grafana/issues/7736) thx [@mtanda](https://github.com/mtanda)
* **OpenTSDB**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
*TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
* **Templating**: support full resolution for $interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
* **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
@@ -647,7 +1271,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **CLI**: Make it possible to reset the admin password using the grafana-cli. [#5479](https://github.com/grafana/grafana/issues/5479)
* **Influxdb**: Support multiple tags in InfluxDB annotations. [#4550](https://github.com/grafana/grafana/pull/4550), thx [@adrianlzt](https://github.com/adrianlzt)
* **LDAP**: Basic Auth now supports LDAP username and password, [#6940](https://github.com/grafana/grafana/pull/6940), thx [@utkarshcmu](https://github.com/utkarshcmu)
* **LDAP**: Now works with Auth Proxy, role and organisation mapping & sync will regularly be performed. [#6895](https://github.com/grafana/grafana/pull/6895), thx [@Seuf](https://github.com/seuf)
* **LDAP**: Now works with Auth Proxy, role and organization mapping & sync will regularly be performed. [#6895](https://github.com/grafana/grafana/pull/6895), thx [@Seuf](https://github.com/seuf)
* **Alerting**: Adds OK as no data option. [#6866](https://github.com/grafana/grafana/issues/6866)
* **Alert list**: Order alerts based on state. [#6676](https://github.com/grafana/grafana/issues/6676)
* **Alerting**: Add api endpoint for pausing all alerts. [#6589](https://github.com/grafana/grafana/issues/6589)
@@ -786,7 +1410,7 @@ due to too many connections/file handles on the data source backend. This proble
* **Scripts**: Use restart instead of start for deb package script, closes [#5282](https://github.com/grafana/grafana/pull/5282)
* **Logging**: Moved to structured logging lib, and moved to component specific level filters via config file, closes [#4590](https://github.com/grafana/grafana/issues/4590)
* **OpenTSDB**: Support nested template variables in tag_values function, closes [#4398](https://github.com/grafana/grafana/issues/4398)
* **Datasource**: Pending data source requests are cancelled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
* **Datasource**: Pending data source requests are canceled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
### Breaking changes
* **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log output.
@@ -1196,8 +1820,8 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
**New features**
- [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site
- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is promted with a warning if he really wants to overwrite the other's changes
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embed a single graph on another web site
- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
- [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
- [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, useful when you want to ignore last minute because it contains incomplete data
- [Issue #171](https://github.com/grafana/grafana/issues/171). Panel: Different time periods, panels can override dashboard relative time and/or add a time shift
@@ -1490,7 +2114,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
#### Fixes
- [Issue #126](https://github.com/grafana/grafana/issues/126). Graphite query lexer change, can now handle regex parameters for aliasSub function
- [Issue #447](https://github.com/grafana/grafana/issues/447). Filter option loading when having muliple nested filters now works better. Options are now reloaded correctly and there are no multiple renders/refresh in between.
- [Issue #447](https://github.com/grafana/grafana/issues/447). Filter option loading when having multiple nested filters now works better. Options are now reloaded correctly and there are no multiple renders/refresh in between.
- [Issue #412](https://github.com/grafana/grafana/issues/412). After a filter option is changed and a nested template param is reloaded, if the current value exists after the options are reloaded the current selected value is kept.
- [Issue #460](https://github.com/grafana/grafana/issues/460). Legend Current value did not display when value was zero
- [Issue #328](https://github.com/grafana/grafana/issues/328). Fix to series toggling bug that caused annotations to be hidden when toggling/hiding series.
@@ -1525,7 +2149,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
- Graphite errors are now much easier to see and troubleshoot with the new inspector ([Issue #265](https://github.com/grafana/grafana/issues/265))
- Use influxdb aliases to distinguish between multiple columns ([Issue #283](https://github.com/grafana/grafana/issues/283))
- Correction to ms axis formater, now formats days correctly. ([Issue #189](https://github.com/grafana/grafana/issues/189))
- Css fix for Firefox and using top menu dropdowns in panel fullscren / edit mode ([Issue #106](https://github.com/grafana/grafana/issues/106))
- Css fix for Firefox and using top menu dropdowns in panel fullscreen / edit mode ([Issue #106](https://github.com/grafana/grafana/issues/106))
- Browser page title is now Grafana - {{dashboard title}} ([Issue #294](https://github.com/grafana/grafana/issues/294))
- Disable auto refresh zooming in (every time you change to an absolute time range), refresh will be restored when you change time range back to relative ([Issue #282](https://github.com/grafana/grafana/issues/282))
- More graphite functions
@@ -1655,3 +2279,4 @@ Thanks to everyone who contributed fixes and provided feedback :+1:
# 1.0.0 (2014-01-19)
First public release
+1 -1
View File
@@ -2,7 +2,7 @@
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
+54
View File
@@ -0,0 +1,54 @@
# Contributing
Grafana uses GitHub to manage contributions.
Contributions take the form of pull requests that will be reviewed by the core team.
* If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
* If you have a trivial fix or improvement, go ahead and create a pull request.
* If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
* Sign our [CLA](http://docs.grafana.org/contribute/cla/).
* For changes in the backend, follow the style guides used in Go [Code Review Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments) and Peter Bourgon's [Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style)
## Steps to Contribute
Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/)
## Pull Request Checklist
* Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.
* If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
* Add tests relevant to the fixed bug or new feature.
### Pull requests with new features
Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
Make sure to include `Closes #<issue number>` or `Fixes #<issue number>` in the pull request description.
### Pull requests with bug fixes
Please make all changes in one commit if possible. Include `Closes #<issue number>` in bottom of the commit message.
A commit message for a bug fix should look something like this.
```
avoid infinite loop in the dashboard provisioner
if one dashboard with an uid is refered to by two
provsioners each provisioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.
Closes #12864
```
If the pull request needs changes before its merged the new commits should be rebased into one commit before its merged.
+86
View File
@@ -0,0 +1,86 @@
# Golang build container
FROM golang:1.11.5
WORKDIR $GOPATH/src/github.com/grafana/grafana
COPY Gopkg.toml Gopkg.lock ./
COPY vendor vendor
ARG DEP_ENSURE=""
RUN if [ ! -z "${DEP_ENSURE}" ]; then \
go get -u github.com/golang/dep/cmd/dep && \
dep ensure --vendor-only; \
fi
COPY pkg pkg
COPY build.go build.go
COPY package.json package.json
RUN go run build.go build
# Node build container
FROM node:10.14.2
WORKDIR /usr/src/app/
COPY package.json yarn.lock ./
COPY packages packages
RUN yarn install --pure-lockfile --no-progress
COPY Gruntfile.js tsconfig.json tslint.json ./
COPY public public
COPY scripts scripts
COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
# Final container
FROM debian:stretch-slim
ARG GF_UID="472"
ARG GF_GID="472"
ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
GF_PATHS_DATA="/var/lib/grafana" \
GF_PATHS_HOME="/usr/share/grafana" \
GF_PATHS_LOGS="/var/log/grafana" \
GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
WORKDIR $GF_PATHS_HOME
RUN apt-get update && apt-get upgrade -y && \
apt-get install -qq -y libfontconfig ca-certificates && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
COPY conf ./conf
RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
groupadd -r -g $GF_GID grafana && \
useradd -r -u $GF_UID -g grafana grafana && \
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
"$GF_PATHS_PROVISIONING/dashboards" \
"$GF_PATHS_PROVISIONING/notifiers" \
"$GF_PATHS_LOGS" \
"$GF_PATHS_PLUGINS" \
"$GF_PATHS_DATA" && \
cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \
chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"
COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
COPY --from=1 /usr/src/app/public ./public
COPY --from=1 /usr/src/app/tools ./tools
COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
EXPOSE 3000
COPY ./packaging/docker/run.sh /run.sh
USER grafana
ENTRYPOINT [ "/run.sh" ]
Generated
+582 -123
View File
File diff suppressed because it is too large Load Diff
+25 -9
View File
@@ -36,7 +36,7 @@ ignored = [
[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "1.12.65"
version = "1.13.56"
[[constraint]]
branch = "master"
@@ -58,10 +58,6 @@ ignored = [
name = "github.com/fatih/color"
version = "1.5.0"
[[constraint]]
name = "github.com/go-ldap/ldap"
version = "2.5.1"
[[constraint]]
branch = "master"
name = "github.com/go-macaron/binding"
@@ -85,11 +81,15 @@ ignored = [
[[constraint]]
name = "github.com/go-xorm/core"
version = "0.5.7"
version = "=0.6.2"
[[override]]
name = "github.com/go-xorm/builder"
version = "=0.3.4"
[[constraint]]
name = "github.com/go-xorm/xorm"
version = "0.6.4"
version = "=0.7.1"
[[constraint]]
name = "github.com/gorilla/websocket"
@@ -101,12 +101,16 @@ ignored = [
[[constraint]]
branch = "master"
name = "github.com/grafana/grafana_plugin_model"
name = "github.com/grafana/grafana-plugin-model"
[[constraint]]
branch = "master"
name = "github.com/hashicorp/go-hclog"
[[constraint]]
name = "github.com/hashicorp/go-plugin"
revision = "e8d22c780116115ae5624720c9af0c97afe4f551"
[[constraint]]
branch = "master"
name = "github.com/hashicorp/go-version"
@@ -125,7 +129,7 @@ ignored = [
[[constraint]]
name = "github.com/mattn/go-sqlite3"
version = "1.6.0"
version = "1.7.0"
[[constraint]]
name = "github.com/opentracing/opentracing-go"
@@ -199,3 +203,15 @@ ignored = [
[[constraint]]
name = "github.com/denisenkom/go-mssqldb"
revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
[[constraint]]
name = "github.com/VividCortex/mysqlerr"
branch = "master"
[[constraint]]
name = "gopkg.in/square/go-jose.v2"
version = "2.1.9"
[[constraint]]
name = "gopkg.in/ldap.v3"
version = "3.0.0"
+9 -2
View File
@@ -1,4 +1,3 @@
/* jshint node:true */
'use strict';
module.exports = function (grunt) {
var os = require('os');
@@ -10,8 +9,17 @@ module.exports = function (grunt) {
destDir: 'dist',
tempDir: 'tmp',
platform: process.platform.replace('win32', 'windows'),
enterprise: false,
};
if (grunt.option('platform')) {
config.platform = grunt.option('platform');
}
if (grunt.option('enterprise')) {
config.enterprise = true;
}
if (grunt.option('arch')) {
config.arch = grunt.option('arch');
} else {
@@ -22,7 +30,6 @@ module.exports = function (grunt) {
}
}
config.coverage = grunt.option('coverage');
config.phjs = grunt.option('phjsToRelease');
config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
+202
View File
@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2015 Grafana Labs
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+18 -4
View File
@@ -1,10 +1,11 @@
-include local/Makefile
all: deps build
deps-go:
go run build.go setup
deps-js:
yarn install --pure-lockfile --no-progress
deps-js: node_modules
deps: deps-js
@@ -22,6 +23,15 @@ build-js:
build: build-go build-js
build-docker-dev:
@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
go run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
cd packaging/docker && docker build --tag grafana/grafana:dev .
build-docker-full:
docker build --tag grafana/grafana:dev .
test-go:
go test -v ./pkg/...
@@ -33,5 +43,9 @@ test: test-go test-js
run:
./bin/grafana-server
protoc:
protoc -I pkg/tsdb/models pkg/tsdb/models/*.proto --go_out=plugins=grpc:pkg/tsdb/models/.
clean:
rm -rf node_modules
rm -rf public/build
node_modules: package.json yarn.lock
yarn install --pure-lockfile --no-progress
+1 -1
View File
@@ -1,5 +1,5 @@
Copyright 2014-2017 Grafana Labs
Copyright 2014-2018 Grafana Labs
This software is based on Kibana:
Copyright 2012-2013 Elasticsearch BV
+9 -4
View File
@@ -1,13 +1,13 @@
# Plugin Development
This document is not meant as complete guide for developing plugins but more as a changelog for changes in
Grafana that can impact plugin development. When ever you as plugin author encounter an issue with your plugin after
This document is not meant as a complete guide for developing plugins but more as a changelog for changes in
Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after
upgrading Grafana please check here before creating an issue.
## Links
- [Datasource plugin written in typescript](https://github.com/grafana/typescript-template-datasource)
- [Simple json dataource plugin](https://github.com/grafana/simple-json-datasource)
- [Datasource plugin written in TypeScript](https://github.com/grafana/typescript-template-datasource)
- [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
- [Plugin development guide](http://docs.grafana.org/plugins/developing/development/)
- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
@@ -27,3 +27,8 @@ If you think we missed exposing a crucial lib or Grafana component let us know b
The angular directive `<spectrum-picker>` is now deprecated (will still work for a version more) but we recommend plugin authors
to upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
## Changes in v6.0
### DashboardSrv.ts
If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard`
+88 -35
View File
@@ -7,63 +7,113 @@
Grafana is an open source, feature rich metrics dashboard and graph editor for
Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
<!---
![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
-->
## Installation
Head to [docs.grafana.org](http://docs.grafana.org/installation/) and [download](https://grafana.com/get)
the latest release.
If you have any problems please read the [troubleshooting guide](http://docs.grafana.org/installation/troubleshooting/).
Head to [docs.grafana.org](http://docs.grafana.org/installation/) for documentation or [download](https://grafana.com/get) to get the latest release.
## Documentation & Support
Be sure to read the [getting started guide](http://docs.grafana.org/guides/gettingstarted/) and the other feature guides.
## Run from master
If you want to build a package yourself, or contribute - Here is a guide for how to do that. You can always find
If you want to build a package yourself, or contribute - here is a guide for how to do that. You can always find
the latest master builds [here](https://grafana.com/grafana/download)
### Dependencies
- Go 1.10
- NodeJS LTS
- Go (Latest Stable)
- bra [`go get github.com/Unknwon/bra`]
- Node.js LTS
- yarn [`npm install -g yarn`]
### Get the project
**The project located in the go-path will be your working directory.**
### Building the backend
```bash
go get github.com/grafana/grafana
cd $GOPATH/src/github.com/grafana/grafana
```
### Building
#### The backend
```bash
go run build.go setup
go run build.go build
```
### Building frontend assets
#### Frontend assets
For this you need nodejs (v.6+).
*For this you need Node.js (LTS version).*
```bash
npm install -g yarn
yarn install --pure-lockfile
npm run watch
```
Run tests
### Run and rebuild on source change
#### Backend
To run the backend and rebuild on source change:
```bash
npm run jest
$GOPATH/bin/bra run
```
Run karma tests
#### Frontend
Rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):
```bash
npm run karma
yarn start
```
### Recompile backend on source change
Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
To rebuild on source change.
```bash
go get github.com/Unknwon/bra
bra run
yarn start:hot
# OR set a theme
env GRAFANA_THEME=light yarn start:hot
```
Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
*Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload.*
Run tests and rebuild on source change:
```bash
yarn jest
```
**Open grafana in your browser (default: e.g. `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).**
### Building a Docker image
There are two different ways to build a Grafana docker image. If your machine is setup for Grafana development and you run linux/amd64 you can build just the image. Otherwise, there is the option to build Grafana completely within Docker.
Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafana:dev`
#### Building on linux/amd64 (fast)
1. Build the frontend `go run build.go build-frontend`
2. Build the docker image `make build-docker-dev`
The resulting image will be tagged as `grafana/grafana:dev`
#### Building anywhere (slower)
Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.
1. `make build-docker-full` or `docker build -t grafana/grafana:dev .`
The resulting image will be tagged as `grafana/grafana:dev`
Notice: If you are using Docker for MacOS, be sure to set the memory limit to be larger than 2 GiB (at docker -> Preferences -> Advanced), otherwise `grunt build` may fail.
## Development
### Dev config
@@ -80,36 +130,39 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode =
#### Frontend
Execute all frontend tests
```bash
npm run test
yarn test
```
Writing & watching frontend tests (we have two test runners)
Writing & watching frontend tests
- jest for all new tests that do not require browser context (React+more)
- Start watcher: `npm run jest`
- Jest will run all test files that end with the name ".jest.ts"
- karma + mocha is used for testing angularjs components. We do want to migrate these test to jest over time (if possible).
- Start watcher: `npm run karma`
- Karma+Mocha runs all files that end with the name "_specs.ts".
- Start watcher: `yarn jest`
- Jest will run all test files that end with the name ".test.ts"
#### Backend
```bash
# Run Golang tests using sqlite3 as database (default)
go test ./pkg/...
go test ./pkg/...
# Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests
GRAFANA_TEST_DB=mysql go test ./pkg/...
GRAFANA_TEST_DB=mysql go test ./pkg/...
# Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests
GRAFANA_TEST_DB=postgres go test ./pkg/...
GRAFANA_TEST_DB=postgres go test ./pkg/...
```
### Datasource and dashboard provisioning
[Here](https://github.com/grafana/grafana/tree/master/devenv) you can find helpful scripts and docker-compose setup
that will populate your dev environment for quicker testing end experimenting.
## Contribute
If you have any idea for an improvement or found a bug, do not hesitate to open an issue.
And if you have time clone this repo and submit a pull request and help me make Grafana
If you have any ideas for improvement or have found a bug, do not hesitate to open an issue.
And if you have time, clone this repo and submit a pull request to help me make Grafana
the kickass metrics & devops dashboard we all dream about!
Read the [contributing](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide then check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) label to find issues that are easy and that we would like help with.
## Plugin development
Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to
@@ -117,5 +170,5 @@ plugin development.
## License
Grafana is distributed under Apache 2.0 License.
Grafana is distributed under [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).
+20 -29
View File
@@ -1,40 +1,31 @@
# Roadmap (2018-02-22)
# Roadmap (2018-08-07)
This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change.
But it will give you an idea of our current vision and plan.
### Short term (1-2 months)
- v5.1
- Build speed improvements & integration test execution
- Kubernetes friendly docker container
- Enterprise LDAP
- Provisioning workflow
- MSSQL datasource
### Mid term (2-4 months)
- v5.2
- Azure monitor backend rewrite
- Elasticsearch alerting
- First login registration view
- Backend plugins? (alert notifiers, auth)
- Crossplatform builds
- IFQL Initial support
### Short term (1-2 months)
- PRs & Bugs
- React Panel Support
- React Query Editor Support
- Metrics & Log Explore UI
- Grafana UI library shared between grafana & plugins
- Seperate visualization from panels
- More reuse between Explore & dashboard
- Explore logging support for more data sources
### Mid term (2-4 months)
- Drilldown links
- Dashboards as code workflows
- React migration
- New panels
### Long term (4 - 8 months)
- Alerting improvements (silence, per series tracking, etc)
- Progress on React migration
- Change visualization (panel type) on the fly.
- Multi stat panel (vertical version of singlestat with bars/graph mode with big number etc)
- Repeat panel by query results
- Alerting improvements (silence, per series tracking, etc)
### In a distant future far far away
- Meta queries
- Integrated light weight TSDB
- Web socket & live data sources
- Meta queries
- Integrated light weight TSDB
- Web socket & live data sources
### Outside contributions
We know this is being worked on right now by contributors (and we hope to merge it when it's ready).
+89
View File
@@ -0,0 +1,89 @@
# Guide to Upgrading Dependencies
Upgrading Go or Node.js requires making changes in many different files. See below for a list and explanation for each.
## Go
- CircleCi
- `grafana/build-container`
- Appveyor
- Dockerfile
## Node.js
- CircleCI
- `grafana/build-container`
- Appveyor
- Dockerfile
## Go Dependencies
Updated using `dep`.
- `Gopkg.toml`
- `Gopkg.lock`
## Node.js Dependencies
Updated using `yarn`.
- `package.json`
## Where to make changes
### CircleCI
Our builds run on CircleCI through our build script.
#### Files
- `.circleci/config.yml`.
#### Dependencies
- nodejs
- golang
- grafana/build-container (our custom docker build container)
### grafana/build-container
The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies.
Link: [grafana-build-container](https://github.com/grafana/grafana-build-container)
#### Dependencies
- fpm
- nodejs
- golang
- crosscompiling (several compilers)
### Appveyor
Master and release builds trigger test runs on Appveyors build environment so that tests will run on Windows.
#### Files:
- `appveyor.yml`
#### Dependencies
- nodejs
- golang
### Dockerfile
There is a Docker build for Grafana in the root of the project that allows anyone to build Grafana just using Docker.
#### Files
- `Dockerfile`
#### Dependencies
- nodejs
- golang
### Local developer environments
Please send out a notice in the grafana-dev slack channel when updating Go or Node.js to make it easier for everyone to update their local developer environments.
+3 -16
View File
@@ -5,9 +5,9 @@ os: Windows Server 2012 R2
clone_folder: c:\gopath\src\github.com\grafana\grafana
environment:
nodejs_version: "6"
GOPATH: c:\gopath
GOVERSION: 1.10
nodejs_version: "8"
GOPATH: C:\gopath
GOVERSION: 1.11.5
install:
- rmdir c:\go /s /q
@@ -38,16 +38,3 @@ artifacts:
- path: grafana-*windows-*.*
name: binzip
type: zip
deploy:
- provider: Environment
name: GrafanaReleaseMaster
on:
buildType: master
- provider: Environment
name: GrafanaReleaseRelease
on:
buildType: release
+162 -81
View File
@@ -16,57 +16,78 @@ import (
"os/exec"
"path"
"path/filepath"
"regexp"
"runtime"
"strconv"
"strings"
"time"
)
const (
windows = "windows"
linux = "linux"
)
var (
versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
goarch string
goos string
gocc string
gocxx string
cgo string
pkgArch string
version string = "v1"
//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
goarch string
goos string
gocc string
cgo bool
pkgArch string
version string = "v1"
// deb & rpm does not support semver so have to handle their version a little differently
linuxPackageVersion string = "v1"
linuxPackageIteration string = ""
race bool
phjsToRelease string
workingDir string
includeBuildNumber bool = true
buildNumber int = 0
includeBuildId bool = true
buildId string = "0"
binaries []string = []string{"grafana-server", "grafana-cli"}
isDev bool = false
enterprise bool = false
skipRpmGen bool = false
skipDebGen bool = false
printGenVersion bool = false
)
const minGoVersion = 1.8
func main() {
log.SetOutput(os.Stdout)
log.SetFlags(0)
ensureGoPath()
var buildIdRaw string
flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
flag.StringVar(&gocc, "cc", "", "CC")
flag.StringVar(&gocxx, "cxx", "", "CXX")
flag.StringVar(&cgo, "cgo-enabled", "", "CGO_ENABLED")
flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
flag.BoolVar(&race, "race", race, "Use race detector")
flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
flag.BoolVar(&skipRpmGen, "skipRpm", skipRpmGen, "skip rpm package generation (default: false)")
flag.BoolVar(&skipDebGen, "skipDeb", skipDebGen, "skip deb package generation (default: false)")
flag.BoolVar(&printGenVersion, "gen-version", printGenVersion, "generate Grafana version and output (default: false)")
flag.Parse()
buildId = shortenBuildId(buildIdRaw)
readVersionFromPackageJson()
if pkgArch == "" {
pkgArch = goarch
}
if printGenVersion {
printGeneratedVersion()
return
}
log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)
if flag.NArg() == 0 {
@@ -94,21 +115,33 @@ func main() {
build("grafana-server", "./pkg/cmd/grafana-server", []string{})
case "build":
clean()
//clean()
for _, binary := range binaries {
build(binary, "./pkg/cmd/"+binary, []string{})
}
case "build-frontend":
grunt(gruntBuildArg("build")...)
case "test":
test("./pkg/...")
grunt("test")
case "package":
grunt(gruntBuildArg("release")...)
if runtime.GOOS != "windows" {
grunt(gruntBuildArg("build")...)
grunt(gruntBuildArg("package")...)
if goos == linux {
createLinuxPackages()
}
case "package-only":
grunt(gruntBuildArg("package")...)
if goos == linux {
createLinuxPackages()
}
case "pkg-archive":
grunt(gruntBuildArg("package")...)
case "pkg-rpm":
grunt(gruntBuildArg("release")...)
createRpmPackages()
@@ -139,9 +172,12 @@ func makeLatestDistCopies() {
}
latestMapping := map[string]string{
".deb": "dist/grafana_latest_amd64.deb",
".rpm": "dist/grafana-latest-1.x86_64.rpm",
".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
"_amd64.deb": "dist/grafana_latest_amd64.deb",
".x86_64.rpm": "dist/grafana-latest-1.x86_64.rpm",
".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
}
for _, file := range files {
@@ -181,9 +217,9 @@ func readVersionFromPackageJson() {
}
// add timestamp to iteration
if includeBuildNumber {
if buildNumber != 0 {
linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
if includeBuildId {
if buildId != "0" {
linuxPackageIteration = fmt.Sprintf("%s%s", buildId, linuxPackageIteration)
} else {
linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
}
@@ -192,6 +228,7 @@ func readVersionFromPackageJson() {
type linuxPackageOptions struct {
packageType string
packageArch string
homeDir string
binPath string
serverBinPath string
@@ -212,8 +249,14 @@ type linuxPackageOptions struct {
}
func createDebPackages() {
debPkgArch := pkgArch
if pkgArch == "armv7" || pkgArch == "armv6" {
debPkgArch = "armhf"
}
createPackage(linuxPackageOptions{
packageType: "deb",
packageArch: debPkgArch,
homeDir: "/usr/share/grafana",
binPath: "/usr/sbin",
configDir: "/etc/grafana",
@@ -232,8 +275,16 @@ func createDebPackages() {
}
func createRpmPackages() {
rpmPkgArch := pkgArch
switch {
case pkgArch == "armv7":
rpmPkgArch = "armhfp"
case pkgArch == "arm64":
rpmPkgArch = "aarch64"
}
createPackage(linuxPackageOptions{
packageType: "rpm",
packageArch: rpmPkgArch,
homeDir: "/usr/share/grafana",
binPath: "/usr/sbin",
configDir: "/etc/grafana",
@@ -252,8 +303,13 @@ func createRpmPackages() {
}
func createLinuxPackages() {
createDebPackages()
createRpmPackages()
if !skipDebGen {
createDebPackages()
}
if !skipRpmGen {
createRpmPackages()
}
}
func createPackage(options linuxPackageOptions) {
@@ -286,19 +342,38 @@ func createPackage(options linuxPackageOptions) {
"-s", "dir",
"--description", "Grafana",
"-C", packageRoot,
"--vendor", "Grafana",
"--url", "https://grafana.com",
"--license", "\"Apache 2.0\"",
"--maintainer", "contact@grafana.com",
"--config-files", options.initdScriptFilePath,
"--config-files", options.etcDefaultFilePath,
"--config-files", options.systemdServiceFilePath,
"--after-install", options.postinstSrc,
"--name", "grafana",
"--version", linuxPackageVersion,
"-p", "./dist",
}
name := "grafana"
if enterprise {
name += "-enterprise"
args = append(args, "--replaces", "grafana")
}
fmt.Printf("pkgArch is set to '%s', generated arch is '%s'\n", pkgArch, options.packageArch)
if pkgArch == "armv6" {
name += "-rpi"
}
args = append(args, "--name", name)
description := "Grafana"
if enterprise {
description += " Enterprise"
}
args = append(args, "--vendor", description)
if !enterprise {
args = append(args, "--license", "\"Apache 2.0\"")
}
if options.packageType == "rpm" {
args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
}
@@ -307,8 +382,8 @@ func createPackage(options linuxPackageOptions) {
args = append(args, "--deb-no-default-config-files")
}
if pkgArch != "" {
args = append(args, "-a", pkgArch)
if options.packageArch != "" {
args = append(args, "-a", options.packageArch)
}
if linuxPackageIteration != "" {
@@ -326,20 +401,6 @@ func createPackage(options linuxPackageOptions) {
runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
}
func verifyGitRepoIsClean() {
rs, err := runError("git", "ls-files", "--modified")
if err != nil {
log.Fatalf("Failed to check if git tree was clean, %v, %v\n", string(rs), err)
return
}
count := len(string(rs))
if count > 0 {
log.Fatalf("Git repository has modified files, aborting")
}
log.Println("Git repository is clean")
}
func ensureGoPath() {
if os.Getenv("GOPATH") == "" {
cwd, err := os.Getwd()
@@ -352,31 +413,37 @@ func ensureGoPath() {
}
}
func ChangeWorkingDir(dir string) {
os.Chdir(dir)
}
func grunt(params ...string) {
if runtime.GOOS == "windows" {
if runtime.GOOS == windows {
runPrint(`.\node_modules\.bin\grunt`, params...)
} else {
runPrint("./node_modules/.bin/grunt", params...)
}
}
func genPackageVersion() string {
if includeBuildId {
return fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
} else {
return version
}
}
func gruntBuildArg(task string) []string {
args := []string{task}
if includeBuildNumber {
args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
} else {
args = append(args, fmt.Sprintf("--pkgVer=%v", version))
}
args = append(args, fmt.Sprintf("--pkgVer=%v", genPackageVersion()))
if pkgArch != "" {
args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
}
if phjsToRelease != "" {
args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
}
if enterprise {
args = append(args, "--enterprise")
}
args = append(args, fmt.Sprintf("--platform=%v", goos))
return args
}
@@ -385,14 +452,23 @@ func setup() {
runPrint("go", "install", "-v", "./pkg/cmd/grafana-server")
}
func printGeneratedVersion() {
fmt.Print(genPackageVersion())
}
func test(pkg string) {
setBuildEnv()
runPrint("go", "test", "-short", "-timeout", "60s", pkg)
}
func build(binaryName, pkg string, tags []string) {
binary := "./bin/" + binaryName
if goos == "windows" {
binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
if isDev {
//don't include os and arch in output path in dev environment
binary = fmt.Sprintf("./bin/%s", binaryName)
}
if goos == windows {
binary += ".exe"
}
@@ -413,6 +489,7 @@ func build(binaryName, pkg string, tags []string) {
if !isDev {
setBuildEnv()
runPrint("go", "version")
fmt.Printf("Targeting %s/%s\n", goos, goarch)
}
runPrint("go", args...)
@@ -433,6 +510,7 @@ func ldflags() string {
b.WriteString(fmt.Sprintf(" -X main.version=%s", version))
b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
return b.String()
}
@@ -455,6 +533,14 @@ func clean() {
func setBuildEnv() {
os.Setenv("GOOS", goos)
if goos == windows {
// require windows >=7
os.Setenv("CGO_CFLAGS", "-D_WIN32_WINNT=0x0601")
}
if goarch != "amd64" || goos != linux {
// needed for all other archs
cgo = true
}
if strings.HasPrefix(goarch, "armv") {
os.Setenv("GOARCH", "arm")
os.Setenv("GOARM", goarch[4:])
@@ -464,15 +550,20 @@ func setBuildEnv() {
if goarch == "386" {
os.Setenv("GO386", "387")
}
if cgo != "" {
os.Setenv("CGO_ENABLED", cgo)
if cgo {
os.Setenv("CGO_ENABLED", "1")
}
if gocc != "" {
os.Setenv("CC", gocc)
}
if gocxx != "" {
os.Setenv("CXX", gocxx)
}
func getGitBranch() string {
v, err := runError("git", "rev-parse", "--abbrev-ref", "HEAD")
if err != nil {
return "master"
}
return string(v)
}
func getGitSha() string {
@@ -492,24 +583,6 @@ func buildStamp() int64 {
return s
}
func buildArch() string {
os := goos
if os == "darwin" {
os = "macosx"
}
return fmt.Sprintf("%s-%s", os, goarch)
}
func run(cmd string, args ...string) []byte {
bs, err := runError(cmd, args...)
if err != nil {
log.Println(cmd, strings.Join(args, " "))
log.Println(string(bs))
log.Fatal(err)
}
return bytes.TrimSpace(bs)
}
func runError(cmd string, args ...string) ([]byte, error) {
ecmd := exec.Command(cmd, args...)
bs, err := ecmd.CombinedOutput()
@@ -598,3 +671,11 @@ func shaFile(file string) error {
return out.Close()
}
func shortenBuildId(buildId string) string {
buildId = strings.Replace(buildId, "-", "", -1)
if len(buildId) < 9 {
return buildId
}
return buildId[0:8]
}
-11
View File
@@ -1,11 +0,0 @@
coverage:
precision: 2
round: down
range: "50...100"
status:
project: yes
patch: yes
changes: no
comment: off
+108 -8
View File
@@ -14,6 +14,9 @@ instance_name = ${HOSTNAME}
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
data = data
# Temporary files in `data` directory older than given duration will be removed
temp_data_lifetime = 24h
# Directory where grafana can store logs
logs = data/log
@@ -31,7 +34,7 @@ protocol = http
# The ip address to bind to, empty will bind to all interfaces
http_addr =
# The http port to use
# The http port to use
http_port = 3000
# The public facing domain name used to access grafana from a browser
@@ -100,6 +103,20 @@ server_cert_name =
# For "sqlite3" only, path relative to data_path setting
path = grafana.db
# For "sqlite3" only. cache mode setting used for connecting to the database
cache_mode = private
#################################### Cache server #############################
[remote_cache]
# Either "redis", "memcached" or "database" default is "database"
type = database
# cache connectionstring options
# database: will use Grafana primary database.
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
# memcache: 127.0.0.1:11211
connstr =
#################################### Session #############################
[session]
# Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file"
@@ -137,6 +154,12 @@ conn_max_lifetime = 14400
# This enables data proxy logging, default is false
logging = false
# How long the data proxy should wait before timing out default is 30 (seconds)
timeout = 30
# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
send_user_header = false
#################################### Analytics ###########################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -163,17 +186,12 @@ google_tag_manager_id =
# default admin user, created on startup
admin_user = admin
# default admin password, can be changed before first start of grafana, or in profile settings
# default admin password, can be changed before first start of grafana, or in profile settings
admin_password = admin
# used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
login_remember_days = 7
cookie_username = grafana_user
cookie_remember_name = grafana_remember
# disable gravatar profile images
disable_gravatar = false
@@ -183,6 +201,12 @@ data_source_proxy_whitelist =
# disable protection against brute force login attempts
disable_brute_force_login_protection = false
# set to true if you host Grafana behind HTTPS. default is false.
cookie_secure = false
# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
cookie_samesite = lax
#################################### Snapshots ###########################
[snapshots]
# snapshot sharing options
@@ -210,6 +234,9 @@ allow_org_create = false
# Set to true to automatically assign new users to the default organization (id 1)
auto_assign_org = true
# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
auto_assign_org_id = 1
# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
auto_assign_org_role = Viewer
@@ -218,6 +245,7 @@ verify_email_enabled = false
# Background text for the user field on the login page
login_hint = email or username
password_hint = password
# Default UI theme ("dark" or "light")
default_theme = dark
@@ -230,13 +258,35 @@ external_manage_info =
# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
viewers_can_edit = false
# Editors can administrate dashboard, folders and teams they create
editors_can_admin = false
[auth]
# Login cookie name
login_cookie_name = grafana_session
# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
login_maximum_inactive_lifetime_days = 7
# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
login_maximum_lifetime_days = 30
# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
token_rotation_interval_minutes = 10
# Set to true to disable (hide) the login form, useful if you use OAuth
disable_login_form = false
# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
disable_signout_menu = false
# URL to redirect the user to after sign out
signout_redirect_url =
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
oauth_auto_login = false
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
@@ -261,6 +311,18 @@ api_url = https://api.github.com/user
team_ids =
allowed_organizations =
#################################### GitLab Auth #########################
[auth.gitlab]
enabled = false
allow_sign_up = true
client_id = some_id
client_secret = some_secret
scopes = api
auth_url = https://gitlab.com/oauth/authorize
token_url = https://gitlab.com/oauth/token
api_url = https://gitlab.com/api/v4
allowed_groups =
#################################### Google Auth #########################
[auth.google]
enabled = false
@@ -300,11 +362,17 @@ allow_sign_up = true
client_id = some_id
client_secret = some_secret
scopes = user:email
email_attribute_name = email:primary
auth_url =
token_url =
api_url =
team_ids =
allowed_organizations =
tls_skip_verify_insecure = false
tls_client_cert =
tls_client_key =
tls_client_ca =
send_client_credentials_via_post = false
#################################### Basic Auth ##########################
[auth.basic]
@@ -318,6 +386,7 @@ header_property = username
auto_sign_up = true
ldap_sync_ttl = 60
whitelist =
headers =
#################################### Auth LDAP ###########################
[auth.ldap]
@@ -345,7 +414,7 @@ templates_pattern = emails/*.html
#################################### Logging ##########################
[log]
# Either "console", "file", "syslog". Default is console and file
# Either "console", "file", "syslog". Default is console and file
# Use space to separate multiple modes, e.g. "console file"
mode = console file
@@ -442,12 +511,31 @@ enabled = true
# Makes it possible to turn off alert rule execution but alerting UI is visible
execute_alerts = true
# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
error_or_timeout = alerting
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
nodata_or_nullvalues = no_data
# Alert notifications can include images, but rendering many images at the same time can overload the server
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
concurrent_render_limit = 5
#################################### Explore #############################
[explore]
# Enable the Explore section
enabled = true
#################################### Internal Grafana Metrics ############
# Metrics available at HTTP API Url /metrics
[metrics]
enabled = true
interval_seconds = 10
#If both are set, basic auth will be required for the metrics endpoint.
basic_auth_username =
basic_auth_password =
# Send internal Grafana metrics to graphite
[metrics.graphite]
# Enable by setting the address setting (ex localhost:2003)
@@ -508,3 +596,15 @@ container_name =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
server_url =
callback_url =
[panels]
enable_alpha = false
disable_sanitize_html = false
[enterprise]
license_path =
+8 -29
View File
@@ -15,6 +15,9 @@ start_tls = false
ssl_skip_verify = false
# set to the path to your root CA certificate or leave unset to use system defaults
# root_ca_cert = "/path/to/certificate.crt"
# Authentication against LDAP servers requiring client certificates
# client_cert = "/path/to/client.crt"
# client_key = "/path/to/client.key"
# Search user bind dn
bind_dn = "cn=admin,dc=grafana,dc=org"
@@ -28,37 +31,11 @@ search_filter = "(cn=%s)"
# An array of base dns to search through
search_base_dns = ["dc=grafana,dc=org"]
# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
# This is done by enabling group_search_filter below. You must also set member_of= "cn"
# in [servers.attributes] below.
# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
# below in such a way that the user's recursive group membership is considered.
#
# Nested Groups + Active Directory (AD) Example:
#
# AD groups store the Distinguished Names (DNs) of members, so your filter must
# recursively search your groups for the authenticating user's DN. For example:
#
# group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
# group_search_filter_user_attribute = "distinguishedName"
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
#
# [servers.attributes]
# ...
# member_of = "distinguishedName"
## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
## For Posix or LDAP setups that does not support member_of attribute you can define the below settings
## Please check grafana LDAP docs for examples
# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
## Defaults to the value of username in [server.attributes]
## Valid options are any of your values in [servers.attributes]
## If you are using nested groups you probably want to set this and member_of in
## [servers.attributes] to "distinguishedName"
# group_search_filter_user_attribute = "distinguishedName"
## An array of the base DNs to search through for groups. Typically uses ou=groups
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
# group_search_filter_user_attribute = "uid"
# Specify names of the ldap attributes your ldap uses
[servers.attributes]
@@ -72,6 +49,8 @@ email = "email"
[[servers.group_mappings]]
group_dn = "cn=admins,dc=grafana,dc=org"
org_role = "Admin"
# To make user an instance admin (Grafana Admin) uncomment line below
# grafana_admin = true
# The Grafana organization database id, optional, if left out the default org (id 1) will be used
# org_id = 1
+4 -1
View File
@@ -7,7 +7,7 @@ apiVersion: 1
# orgId: 1
# # list of datasources to insert/update depending
# # on what's available in the datbase
# # on what's available in the database
#datasources:
# # <string, required> name of the datasource. Required
# - name: Graphite
@@ -40,11 +40,14 @@ apiVersion: 1
# graphiteVersion: "1.1"
# tlsAuth: true
# tlsAuthWithCACert: true
# httpHeaderName1: "Authorization"
# # <string> json object of data that will be encrypted.
# secureJsonData:
# tlsCACert: "..."
# tlsClientCert: "..."
# tlsClientKey: "..."
# # <openshift\kubernetes token example>
# httpHeaderValue1: "Bearer xf5yhfkpsnmgo"
# version: 1
# # <bool> allow users to edit datasources from the UI.
# editable: false
+25
View File
@@ -0,0 +1,25 @@
# # config file version
apiVersion: 1
# notifiers:
# - name: default-slack-temp
# type: slack
# org_name: Main Org.
# is_default: true
# uid: notifier1
# settings:
# recipient: "XXX"
# token: "xoxb"
# uploadImage: true
# url: https://slack.com
# - name: default-email
# type: email
# org_id: 1
# uid: notifier2
# is_default: false
# settings:
# addresses: example11111@example.com
# delete_notifiers:
# - name: default-slack-temp
# org_name: Main Org.
# uid: notifier1
+96 -7
View File
@@ -14,6 +14,9 @@
# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
;data = /var/lib/grafana
# Temporary files in `data` directory older than given duration will be removed
;temp_data_lifetime = 24h
# Directory where grafana can store logs
;logs = /var/log/grafana
@@ -96,6 +99,20 @@
# Set to true to log the sql calls and execution times.
log_queries =
# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
;cache_mode = private
#################################### Cache server #############################
[remote_cache]
# Either "redis", "memcached" or "database" default is "database"
;type = database
# cache connectionstring options
# database: will use Grafana primary database.
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
# memcache: 127.0.0.1:11211
;connstr =
#################################### Session ####################################
[session]
# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
@@ -124,6 +141,12 @@ log_queries =
# This enables data proxy logging, default is false
;logging = false
# How long the data proxy should wait before timing out default is 30 (seconds)
;timeout = 30
# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
;send_user_header = false
#################################### Analytics ####################################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -142,6 +165,9 @@ log_queries =
# Google Analytics universal tracking code, only enabled if you specify an id here
;google_analytics_ua_id =
# Google Tag Manager ID, only enabled if you specify an id here
;google_tag_manager_id =
#################################### Security ####################################
[security]
# default admin user, created on startup
@@ -153,11 +179,6 @@ log_queries =
# used for signing
;secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
;login_remember_days = 7
;cookie_username = grafana_user
;cookie_remember_name = grafana_remember
# disable gravatar profile images
;disable_gravatar = false
@@ -167,6 +188,12 @@ log_queries =
# disable protection against brute force login attempts
;disable_brute_force_login_protection = false
# set to true if you host Grafana behind HTTPS. default is false.
;cookie_secure = false
# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
;cookie_samesite = lax
#################################### Snapshots ###########################
[snapshots]
# snapshot sharing options
@@ -198,6 +225,7 @@ log_queries =
# Background text for the user field on the login page
;login_hint = email or username
;password_hint = password
# Default UI theme ("dark" or "light")
;default_theme = dark
@@ -210,14 +238,36 @@ log_queries =
# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
;viewers_can_edit = false
# Editors can administrate dashboard, folders and teams they create
;editors_can_admin = false
[auth]
# Login cookie name
;login_cookie_name = grafana_session
# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days,
;login_maximum_inactive_lifetime_days = 7
# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
;login_maximum_lifetime_days = 30
# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
;token_rotation_interval_minutes = 10
# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
;disable_login_form = false
# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
;disable_signout_menu = false
#################################### Anonymous Auth ##########################
# URL to redirect the user to after sign out
;signout_redirect_url =
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
;oauth_auto_login = false
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
;enabled = false
@@ -266,6 +316,14 @@ log_queries =
;api_url = https://foo.bar/user
;team_ids =
;allowed_organizations =
;tls_skip_verify_insecure = false
;tls_client_cert =
;tls_client_key =
;tls_client_ca =
; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
;send_client_credentials_via_post = false
#################################### Grafana.com Auth ####################
[auth.grafana_com]
@@ -284,6 +342,7 @@ log_queries =
;auto_sign_up = true
;ldap_sync_ttl = 60
;whitelist = 192.168.1.1, 192.168.2.1
;headers = Email:X-User-Email, Name:X-User-Name
#################################### Basic Auth ##########################
[auth.basic]
@@ -377,6 +436,21 @@ log_queries =
# Makes it possible to turn off alert rule execution but alerting UI is visible
;execute_alerts = true
# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
;error_or_timeout = alerting
# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
;nodata_or_nullvalues = no_data
# Alert notifications can include images, but rendering many images at the same time can overload the server
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
;concurrent_render_limit = 5
#################################### Explore #############################
[explore]
# Enable the Explore section
;enabled = true
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /metrics
[metrics]
@@ -410,7 +484,7 @@ log_queries =
;sampler_param = 1
#################################### Grafana.com integration ##########################
# Url used to to import dashboards directly from Grafana.com
# Url used to import dashboards directly from Grafana.com
[grafana_com]
;url = https://grafana.com
@@ -445,3 +519,18 @@ log_queries =
[external_image_storage.local]
# does not require any configuration
[rendering]
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =
[enterprise]
# Path to a valid Grafana Enterprise license.jwt file
;license_path =
[panels]
;enable_alpha = false
# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
;disable_sanitize_html = false
+33
View File
@@ -0,0 +1,33 @@
This folder contains useful scripts and configuration for...
* Configuring dev datasources in Grafana
* Configuring dev & test scenarios dashboards.
* Creating docker-compose file with DBs and fake data.
# Dev dashboards and data sources
```bash
./setup.sh
```
After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as
a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards.
#### Dev dashboards
Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are
found. The dashboards are located in the `devenv/dev-dashboards` folder.
# docker-compose with databases
```bash
./create_docker_compose.sh influxdb prometheus2 elastic5
docker-compose up
```
This command will create a docker compose file with specified databases configured and ready to run. Each database has
a prepared image with some fake data ready to use. For available databases see `docker/blocks` directory. Mind that
for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
version.
@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'Bulk dashboards'
folder: 'Bulk dashboards'
type: file
options:
path: devenv/bulk-dashboards
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'Bulk alerting dashboards'
folder: 'Bulk alerting dashboards'
type: file
options:
path: devenv/bulk_alerting_dashboards
@@ -0,0 +1,168 @@
{
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"links": [],
"panels": [
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
65
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"frequency": "10s",
"handler": 1,
"name": "bulk alerting",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-prometheus",
"fill": 1,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"$$hashKey": "object:117",
"expr": "go_goroutines",
"format": "time_series",
"intervalFactor": 1,
"refId": "A"
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 50
}
],
"timeFrom": null,
"timeShift": null,
"title": "Panel Title",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
}
],
"schemaVersion": 16,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",
"title": "New dashboard",
"uid": null,
"version": 0
}
@@ -1,13 +1,13 @@
#!/bin/bash
blocks_dir=blocks
blocks_dir=docker/blocks
docker_dir=docker
template_dir=templates
grafana_config_file=conf.tmp
grafana_config=config
compose_header_file=compose_header.yml
compose_header_file=docker/compose_header.yml
fig_file=docker-compose.yaml
fig_config=docker-compose.yaml
+9
View File
@@ -0,0 +1,9 @@
apiVersion: 1
providers:
- name: 'gdev dashboards'
folder: 'gdev dashboards'
type: file
updateIntervalSeconds: 15
options:
path: devenv/dev-dashboards
+161
View File
@@ -0,0 +1,161 @@
apiVersion: 1
datasources:
- name: gdev-graphite
type: graphite
access: proxy
url: http://localhost:8080
jsonData:
graphiteVersion: "1.1"
- name: gdev-prometheus
type: prometheus
access: proxy
url: http://localhost:9090
- name: gdev-testdata
type: testdata
isDefault: true
- name: gdev-influxdb
type: influxdb
access: proxy
database: site
user: grafana
password: grafana
url: http://localhost:8086
jsonData:
timeInterval: "15s"
- name: gdev-opentsdb
type: opentsdb
access: proxy
url: http://localhost:4242
jsonData:
tsdbResolution: 1
tsdbVersion: 1
- name: gdev-elasticsearch-v2-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 2
- name: gdev-elasticsearch-v2-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 2
- name: gdev-elasticsearch-v5-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:10200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 5
- name: gdev-elasticsearch-v5-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:10200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 5
- name: gdev-elasticsearch-v6-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:11200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 60
- name: gdev-elasticsearch-v6-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:11200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 60
- name: gdev-mysql
type: mysql
url: localhost:3306
database: grafana
user: grafana
password: password
- name: gdev-mysql-ds-tests
type: mysql
url: localhost:3306
database: grafana_ds_tests
user: grafana
password: password
- name: gdev-mssql
type: mssql
url: localhost:1433
database: grafana
user: grafana
secureJsonData:
password: Password!
- name: gdev-mssql-ds-tests
type: mssql
url: localhost:1433
database: grafanatest
user: grafana
secureJsonData:
password: Password!
- name: gdev-postgres
type: postgres
url: localhost:5432
database: grafana
user: grafana
secureJsonData:
password: password
jsonData:
sslmode: "disable"
- name: gdev-postgres-ds-tests
type: postgres
url: localhost:5432
database: grafanadstest
user: grafanatest
secureJsonData:
password: grafanatest
jsonData:
sslmode: "disable"
- name: gdev-cloudwatch
type: cloudwatch
editable: true
jsonData:
authType: credentials
defaultRegion: eu-west-2
- name: gdev-loki
type: loki
access: proxy
url: http://localhost:3100
editable: false
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,510 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "08:30",
"fromDayOfWeek": 1,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "16:45",
"toDayOfWeek": 5
}
],
"timeShift": null,
"title": "Business Hours",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "20:00",
"fromDayOfWeek": 7,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "23:00",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Sunday's 20-23",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "#d683ce"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 16
},
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 0.5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 0, 0, 0.22)",
"from": "",
"fromDayOfWeek": 1,
"line": true,
"lineColor": "rgba(255, 0, 0, 0.32)",
"op": "time",
"to": "",
"toDayOfWeek": 1
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 127, 0, 0.22)",
"fromDayOfWeek": 2,
"line": true,
"lineColor": "rgba(255, 127, 0, 0.32)",
"op": "time",
"toDayOfWeek": 2
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 255, 0, 0.22)",
"fromDayOfWeek": 3,
"line": true,
"lineColor": "rgba(255, 255, 0, 0.22)",
"op": "time",
"toDayOfWeek": 3
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 255, 0, 0.22)",
"fromDayOfWeek": 4,
"line": true,
"lineColor": "rgba(0, 255, 0, 0.32)",
"op": "time",
"toDayOfWeek": 4
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 0, 255, 0.22)",
"fromDayOfWeek": 5,
"line": true,
"lineColor": "rgba(0, 0, 255, 0.32)",
"op": "time",
"toDayOfWeek": 5
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(75, 0, 130, 0.22)",
"fromDayOfWeek": 6,
"line": true,
"lineColor": "rgba(75, 0, 130, 0.32)",
"op": "time",
"toDayOfWeek": 6
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(148, 0, 211, 0.22)",
"fromDayOfWeek": 7,
"line": true,
"lineColor": "rgba(148, 0, 211, 0.32)",
"op": "time",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Each day of week",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 24
},
"id": 5,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": false,
"from": "05:00",
"line": true,
"op": "time"
}
],
"timeShift": null,
"title": "05:00",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"time": {
"from": "now-30d",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "Panel Tests - Graph (Time Regions)",
"version": 1
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,649 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "Elastic 5 Logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1542303970887,
"links": [
{
"icon": "external link",
"tags": [
"gdev",
"elasticsearch"
],
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [
25,
50,
75,
95,
99
]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v2-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
}
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"elasticsearch",
"gdev"
],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v2-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v2",
"uid": "RlqLq2fiz",
"version": 2
}
@@ -0,0 +1,651 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "Elastic 5 Logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1542303896062,
"links": [
{
"asDropdown": false,
"icon": "external link",
"tags": [
"gdev",
"elasticsearch"
],
"title": "Dashboard",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [
25,
50,
75,
95,
99
]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v5-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
}
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"elasticsearch",
"gdev"
],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v5-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v5",
"uid": "8HjT32Bmz",
"version": 27
}
@@ -0,0 +1,649 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "Elastic 5 Logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1542303999511,
"links": [
{
"icon": "external link",
"tags": [
"gdev",
"elasticsearch"
],
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [
25,
50,
75,
95,
99
]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v6-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
}
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"elasticsearch",
"gdev"
],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v6-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"status": "Stable",
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v6",
"uid": "NF8Pq2Biz",
"version": 2
}
@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_MSSQL",
"label": "MSSQL",
"description": "",
"type": "datasource",
"pluginId": "mssql",
"pluginName": "MSSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mssql",
"name": "MSSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1520976748896,
"iteration": 1532618661457,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -149,14 +112,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 18,
@@ -234,14 +201,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -313,11 +284,15 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [],
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"fontSize": "100%",
"gridPos": {
"h": 10,
@@ -371,13 +346,13 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": [],
"tags": ["gdev", "mssql", "fake-data-gen"],
"templating": {
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -387,6 +362,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -397,7 +373,7 @@
{
"allValue": null,
"current": {},
"datasource": "${DS_MSSQL}",
"datasource": "gdev-mssql",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -407,6 +383,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -499,6 +476,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -533,7 +511,7 @@
]
},
"timezone": "",
"title": "Grafana Fake Data Gen - MSSQL",
"title": "Datasource tests - MSSQL",
"uid": "86Js1xRmk",
"version": 11
"version": 1
}
@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_MYSQL",
"label": "MySQL",
"description": "",
"type": "datasource",
"pluginId": "mysql",
"pluginName": "MySQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": "5.0.0"
},
{
"type": "datasource",
"id": "mysql",
"name": "MySQL",
"version": "5.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": "5.0.0"
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1523372133566,
"iteration": 1532620738041,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -161,7 +124,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 18,
@@ -251,7 +214,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fill": 2,
"gridPos": {
"h": 9,
@@ -332,7 +295,7 @@
},
{
"columns": [],
"datasource": "${DS_MYSQL}",
"datasource": "gdev-mysql",
"fontSize": "100%",
"gridPos": {
"h": 9,
@@ -390,6 +353,7 @@
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"fake-data-gen",
"mysql"
],
@@ -397,8 +361,11 @@
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_MYSQL}",
"current": {
"text": "America",
"value": "America"
},
"datasource": "gdev-mysql",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -408,6 +375,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -417,8 +385,11 @@
},
{
"allValue": null,
"current": {},
"datasource": "${DS_MYSQL}",
"current": {
"text": "All",
"value": "$__all"
},
"datasource": "gdev-mysql",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -428,6 +399,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -520,6 +492,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -554,7 +527,7 @@
]
},
"timezone": "",
"title": "Grafana Fake Data Gen - MySQL",
"title": "Datasource tests - MySQL",
"uid": "DGsCac3kz",
"version": 8
}
@@ -1,40 +1,4 @@
{
"__inputs": [
{
"name": "DS_POSTGRESQL",
"label": "PostgreSQL",
"description": "",
"type": "datasource",
"pluginId": "postgres",
"pluginName": "PostgreSQL"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.0.0"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "postgres",
"name": "PostgreSQL",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": ""
}
],
"annotations": {
"list": [
{
@@ -52,8 +16,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1518601837383,
"iteration": 1532620601931,
"links": [],
"panels": [
{
@@ -63,7 +26,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 9,
@@ -112,7 +75,7 @@
{
"alias": "",
"format": "time_series",
"rawSql": "SELECT\n $__timeGroup(\"createdAt\",'$summarize'),\n min(value) as \"value\",\n 'total avg' as \"metric\"\nFROM \n grafana_metric\nWHERE\n $__timeFilter(\"createdAt\") AND\n measurement = 'logins.count'\nGROUP BY time",
"rawSql": "SELECT\n $__timeGroup(\"createdAt\",'$summarize'),\n min(value) as \"value\",\n 'total avg' as \"metric\"\nFROM \n grafana_metric\nWHERE\n $__timeFilter(\"createdAt\") AND\n measurement = 'logins.count'\nGROUP BY time\nORDER BY time",
"refId": "B"
}
],
@@ -150,14 +113,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 18,
@@ -236,14 +203,18 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fill": 2,
"gridPos": {
"h": 9,
@@ -316,11 +287,15 @@
"min": null,
"show": true
}
]
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [],
"datasource": "${DS_POSTGRESQL}",
"datasource": "gdev-postgres",
"fontSize": "100%",
"gridPos": {
"h": 9,
@@ -348,11 +323,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -376,16 +347,16 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"fake-data-gen",
"postgres"
],
"tags": ["gdev", "fake-data-gen", "postgres"],
"templating": {
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_POSTGRESQL}",
"current": {
"text": "America",
"value": "America"
},
"datasource": "gdev-postgres",
"hide": 0,
"includeAll": false,
"label": "Datacenter",
@@ -395,6 +366,7 @@
"query": "SELECT DISTINCT datacenter FROM grafana_metric",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -404,8 +376,11 @@
},
{
"allValue": null,
"current": {},
"datasource": "${DS_POSTGRESQL}",
"current": {
"text": "All",
"value": "$__all"
},
"datasource": "gdev-postgres",
"hide": 0,
"includeAll": true,
"label": "Hostname",
@@ -415,6 +390,7 @@
"query": "SELECT DISTINCT hostname FROM grafana_metric WHERE datacenter='$datacenter'",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
@@ -507,6 +483,7 @@
],
"query": "1s,10s,30s,1m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"skipUrlSync": false,
"type": "interval"
}
]
@@ -516,32 +493,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Grafana Fake Data Gen - PostgreSQL",
"title": "Datasource tests - Postgres",
"uid": "JYola5qzz",
"version": 1
}
"version": 4
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,580 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "08:30",
"fromDayOfWeek": 1,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "16:45",
"toDayOfWeek": 5
}
],
"timeShift": null,
"title": "Business Hours",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "20:00",
"fromDayOfWeek": 7,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "23:00",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Sunday's 20-23",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "#d683ce"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 16
},
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 0.5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 0, 0, 0.22)",
"from": "",
"fromDayOfWeek": 1,
"line": true,
"lineColor": "rgba(255, 0, 0, 0.32)",
"op": "time",
"to": "",
"toDayOfWeek": 1
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 127, 0, 0.22)",
"fromDayOfWeek": 2,
"line": true,
"lineColor": "rgba(255, 127, 0, 0.32)",
"op": "time",
"toDayOfWeek": 2
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 255, 0, 0.22)",
"fromDayOfWeek": 3,
"line": true,
"lineColor": "rgba(255, 255, 0, 0.22)",
"op": "time",
"toDayOfWeek": 3
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 255, 0, 0.22)",
"fromDayOfWeek": 4,
"line": true,
"lineColor": "rgba(0, 255, 0, 0.32)",
"op": "time",
"toDayOfWeek": 4
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 0, 255, 0.22)",
"fromDayOfWeek": 5,
"line": true,
"lineColor": "rgba(0, 0, 255, 0.32)",
"op": "time",
"toDayOfWeek": 5
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(75, 0, 130, 0.22)",
"fromDayOfWeek": 6,
"line": true,
"lineColor": "rgba(75, 0, 130, 0.32)",
"op": "time",
"toDayOfWeek": 6
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(148, 0, 211, 0.22)",
"fromDayOfWeek": 7,
"line": true,
"lineColor": "rgba(148, 0, 211, 0.32)",
"op": "time",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Each day of week",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 24
},
"id": 5,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": false,
"from": "05:00",
"line": true,
"op": "time"
}
],
"timeShift": null,
"title": "05:00",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 1,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 32
},
"id": 7,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(234, 112, 112, 0.12)",
"from": "22:00",
"line": false,
"lineColor": "rgba(237, 46, 24, 0.60)",
"op": "time",
"to": "00:30"
}
],
"timeShift": null,
"title": "From 22:00 to 00:30 (crossing midnight)",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"refresh": false,
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "panel-tests"],
"templating": {
"list": []
},
"time": {
"from": "now-30d",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Panel Tests - Graph (Time Regions)",
"uid": "XMjIZPmik",
"version": 9
}
@@ -0,0 +1,296 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"id": 6,
"links": [],
"options-gauge": {
"decimals": 0,
"maxValue": 100,
"minValue": 0,
"options": {
"decimals": 0,
"maxValue": 100,
"minValue": 0,
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "avg",
"suffix": "",
"thresholds": [],
"unit": "none",
"valueMappings": []
},
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "avg",
"suffix": "",
"thresholds": [
{
"color": "#1F78C1",
"index": 5,
"value": 96.875
},
{
"color": "#E24D42",
"index": 4,
"value": 93.75
},
{
"color": "#EF843C",
"index": 3,
"value": 87.5
},
{
"color": "#6ED0E0",
"index": 2,
"value": 75
},
{
"color": "#EAB839",
"index": 1,
"value": 50
},
{
"color": "#7EB26D",
"index": 0,
"value": null
}
],
"unit": "none",
"valueMappings": [
{
"from": "50",
"id": 1,
"operator": "",
"text": "Hello :) ",
"to": "90",
"type": 2,
"value": ""
}
]
},
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Horizontal with range variable",
"type": "gauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 2,
"links": [],
"options-gauge": {
"decimals": 0,
"maxValue": 100,
"minValue": 0,
"options": {
"decimals": 0,
"maxValue": 100,
"minValue": 0,
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "avg",
"suffix": "",
"thresholds": [],
"unit": "none",
"valueMappings": []
},
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "avg",
"suffix": "",
"thresholds": [
{
"color": "#EAB839",
"index": 1,
"value": 50
},
{
"color": "#7EB26D",
"index": 0,
"value": null
}
],
"unit": "none",
"valueMappings": []
},
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Repeat horizontal",
"type": "gauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 14,
"w": 5,
"x": 0,
"y": 16
},
"id": 4,
"links": [],
"options-gauge": {
"decimals": 0,
"maxValue": "200",
"minValue": 0,
"options": {
"decimals": 0,
"maxValue": 100,
"minValue": 0,
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "avg",
"suffix": "",
"thresholds": [],
"unit": "none",
"valueMappings": []
},
"prefix": "",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"stat": "max",
"suffix": "",
"thresholds": [
{
"color": "#6ED0E0",
"index": 2,
"value": 75
},
{
"color": "#EAB839",
"index": 1,
"value": 50
},
{
"color": "#7EB26D",
"index": 0,
"value": null
}
],
"unit": "none",
"valueMappings": []
},
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Vertical",
"type": "gauge"
}
],
"schemaVersion": 17,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Multi series gauges",
"uid": "szkuR1umk",
"version": 7
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,574 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 0,
"y": 0
},
"id": 2,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "postfix",
"postfixFontSize": "50%",
"prefix": "prefix",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "prefix 3 ms (green) postfixt + sparkline",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 8,
"y": 0
},
"id": 3,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "3 ms (red) + full height sparkline",
"type": "singlestat",
"valueFontSize": "200%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": true,
"colorPrefix": false,
"colorValue": false,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 0
},
"id": 4,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,2,3,4,5"
}
],
"thresholds": "5,10",
"title": "3 ms + red background",
"type": "singlestat",
"valueFontSize": "200%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": true,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 0,
"y": 7
},
"id": 5,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 7,
"w": 8,
"x": 8,
"y": 7
},
"id": 6,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90, no labels",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
"format": "ms",
"gauge": {
"maxValue": 150,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": false
},
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 7
},
"id": 7,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "10,20,80"
}
],
"thresholds": "81,90",
"title": "80 ms green gauge, thresholds 81, 90, no markers or labels",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "current"
}
],
"refresh": false,
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "Panel Tests - Singlestat",
"uid": "singlestat",
"version": 14
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,559 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 11,
"w": 12,
"x": 0,
"y": 0
},
"id": 3,
"links": [],
"pageSize": 10,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "server1",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
},
{
"alias": "server2",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0"
}
],
"title": "Time series to rows (2 pages)",
"transform": "timeseries_to_rows",
"type": "table"
},
{
"columns": [
{
"text": "Avg",
"value": "avg"
},
{
"text": "Max",
"value": "max"
},
{
"text": "Current",
"value": "current"
}
],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 11,
"w": 12,
"x": 12,
"y": 0
},
"id": 4,
"links": [],
"pageSize": 10,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "server1",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
},
{
"alias": "server2",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0"
}
],
"title": "Time series aggregations",
"transform": "timeseries_aggregations",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 11
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "row",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "/Color/",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "ColorValue",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
}
],
"title": "color row by threshold",
"transform": "timeseries_to_columns",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 18
},
"id": 2,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "ColorValue",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,20,10"
},
{
"alias": "ColorCell",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "5,1,2,3,4,5,10,20"
}
],
"title": "Column style thresholds & units",
"transform": "timeseries_to_columns",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 10,
"w": 24,
"x": 0,
"y": 26
},
"id": 6,
"links": [],
"pageSize": 20,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.5)",
"rgba(237, 129, 40, 0.5)",
"rgba(50, 172, 45, 0.5)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"link": true,
"linkTargetBlank": true,
"linkTooltip": "",
"linkUrl": "http://www.grafana.com",
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.5)",
"rgba(237, 129, 40, 0.5)",
"rgba(50, 172, 45, 0.5)"
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"link": true,
"linkUrl": "http://www.grafana.com",
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "ColorValue",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "null,1,20,90,30,5,0,20,10"
},
{
"alias": "ColorCell",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "null,5,1,2,3,4,5,10,20"
}
],
"title": "Column style thresholds and links",
"transform": "timeseries_to_columns",
"type": "table"
}
],
"refresh": false,
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "Panel Tests - Table",
"uid": "pttable",
"version": 2
}
+712
View File
@@ -0,0 +1,712 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
60
],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"frequency": "60s",
"handler": 1,
"name": "TestData - Always OK",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
"y": 0
},
"id": 3,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 60
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always OK",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": "125",
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
177
],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"executionErrorState": "alerting",
"for": "0m",
"frequency": "60s",
"handler": 1,
"name": "TestData - Always Alerting",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 0
},
"id": 4,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 177
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
1
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"15m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "5m",
"frequency": "1m",
"handler": 1,
"name": "TestData - No data",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
"y": 7
},
"id": 5,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "no_data_points",
"stringInput": "",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 1
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "No data",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
177
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"15m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "1m",
"frequency": "1m",
"handler": 1,
"name": "TestData - Always Pending",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 7
},
"id": 6,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 177
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting with For",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
100
],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "900000h",
"frequency": "1m",
"handler": 1,
"name": "Always Pending",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 12,
"x": 12,
"y": 14
},
"id": 7,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 100
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting with For",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"revision": 2,
"schemaVersion": 16,
"style": "dark",
"tags": [
"grafana-test"
],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "Alerting with TestData",
"uid": "7MeksYbmk",
"version": 7
}
@@ -0,0 +1,7 @@
FROM golang:latest
ADD main.go /
WORKDIR /
RUN go build -o main .
EXPOSE 3010
ENTRYPOINT ["/main"]
@@ -0,0 +1,5 @@
alert_webhook_listener:
build: docker/blocks/alert_webhook_listener
network_mode: host
ports:
- "3010:3010"
@@ -0,0 +1,24 @@
package main
import (
"fmt"
"io"
"io/ioutil"
"net/http"
)
func hello(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
if err != nil {
return
}
line := fmt.Sprintf("webbhook: -> %s", string(body))
fmt.Println(line)
io.WriteString(w, line)
}
func main() {
http.HandleFunc("/", hello)
http.ListenAndServe(":3010", nil)
}
@@ -2,8 +2,8 @@
# http://localhost:3000 (Grafana running locally)
#
# Please note that you'll need to change the root_url in the Grafana configuration:
# root_url = %(protocol)s://%(domain)s:/grafana/
# root_url = %(protocol)s://%(domain)s:10081/grafana/
apacheproxy:
build: blocks/apache_proxy
build: docker/blocks/apache_proxy
network_mode: host
@@ -1,5 +1,5 @@
collectd:
build: blocks/collectd
build: docker/blocks/collectd
environment:
HOST_NAME: myserver
GRAPHITE_HOST: graphite
@@ -5,7 +5,7 @@
- "9200:9200"
- "9300:9300"
volumes:
- ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./docker/blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
fake-elastic-data:
image: grafana/fake-data-gen
@@ -1,15 +1,15 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
elasticsearch5:
image: elasticsearch:5
command: elasticsearch
ports:
- "10200:9200"
- "10300:9300"
- '10200:9200'
- '10300:9300'
fake-elastic5-data:
image: grafana/fake-data-gen
network_mode: bridge
links:
- elasticsearch5
# network_mode: bridge
environment:
FD_DATASOURCE: elasticsearch
FD_PORT: 10200
@@ -0,0 +1,15 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
elasticsearch6:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
command: elasticsearch
ports:
- "11200:9200"
- "11300:9300"
fake-elastic6-data:
image: grafana/fake-data-gen
network_mode: bridge
environment:
FD_DATASOURCE: elasticsearch6
FD_PORT: 11200
@@ -0,0 +1,2 @@
script.inline: on
script.indexed: on
@@ -0,0 +1,54 @@
version: '3'
volumes:
freeipa_data: {}
services:
freeipa:
image: freeipa/freeipa-server:fedora-29
container_name: freeipa
stdin_open: true
tty: true
sysctls:
- net.ipv6.conf.all.disable_ipv6=0
hostname: ipa.example.test
environment:
# - DEBUG_TRACE=1
- IPA_SERVER_IP=172.17.0.2
- DEBUG_NO_EXIT=1
- IPA_SERVER_HOSTNAME=ipa.example.test
- PASSWORD=Secret123
- HOSTNAME=ipa.example.test
command:
- --admin-password=Secret123
- --ds-password=Secret123
- -U
- --realm=EXAMPLE.TEST
ports:
# FreeIPA WebUI
- "80:80"
- "443:443"
# Kerberos
- "88:88/udp"
- "88:88"
- "464:464/udp"
- "464:464"
# LDAP
- "389:389"
- "636:636"
# DNS
# - "53:53/udp"
# - "53:53"
# NTP
- "123:123/udp"
# other
- "7389:7389"
- "9443:9443"
- "9444:9444"
- "9445:9445"
tmpfs:
- /run
- /tmp
volumes:
- freeipa_data:/data:Z
- /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -0,0 +1,74 @@
# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
# [log]
# filters = ldap:debug
[[servers]]
# Ldap server host (specify multiple hosts space separated)
host = "172.17.0.1"
# Default port is 389 or 636 if use_ssl = true
port = 389
# Set to true if ldap server supports TLS
use_ssl = false
# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
start_tls = false
# set to true if you want to skip ssl cert validation
ssl_skip_verify = false
# set to the path to your root CA certificate or leave unset to use system defaults
# root_ca_cert = "/path/to/certificate.crt"
# Search user bind dn
bind_dn = "uid=admin,cn=users,cn=accounts,dc=example,dc=test"
# Search user bind password
# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
bind_password = 'Secret123'
# User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
search_filter = "(uid=%s)"
# An array of base dns to search through
search_base_dns = ["cn=users,cn=accounts,dc=example,dc=test"]
# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
# This is done by enabling group_search_filter below. You must also set member_of= "cn"
# in [servers.attributes] below.
# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
# below in such a way that the user's recursive group membership is considered.
#
# Nested Groups + Active Directory (AD) Example:
#
# AD groups store the Distinguished Names (DNs) of members, so your filter must
# recursively search your groups for the authenticating user's DN. For example:
#
# group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
# group_search_filter_user_attribute = "distinguishedName"
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
#
# [servers.attributes]
# ...
# member_of = "distinguishedName"
## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
## Defaults to the value of username in [server.attributes]
## Valid options are any of your values in [servers.attributes]
## If you are using nested groups you probably want to set this and member_of in
## [servers.attributes] to "distinguishedName"
# group_search_filter_user_attribute = "distinguishedName"
## An array of the base DNs to search through for groups. Typically uses ou=groups
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
# Specify names of the ldap attributes your ldap uses
[servers.attributes]
name = "givenName"
username = "uid"
member_of = "memberOf"
# surname = "sn"
# email = "mail"
[[servers.group_mappings]]
# If you want to match all (or no ldap groups) then you can use wildcard
group_dn = "*"
org_role = "Viewer"
+32
View File
@@ -0,0 +1,32 @@
# Notes on FreeIPA LDAP Docker Block
Users have to be created manually. The docker-compose up command takes a few minutes to run.
## Create a user
`docker exec -it freeipa /bin/bash`
To create a user with username: `ldap-viewer` and password: `grafana123`
```bash
kinit admin
```
Log in with password `Secret123`
```bash
ipa user-add ldap-viewer --first ldap --last viewer
ipa passwd ldap-viewer
ldappasswd -D uid=ldap-viewer,cn=users,cn=accounts,dc=example,dc=org -w test -a test -s grafana123
```
## Enabling FreeIPA LDAP in Grafana
Copy the ldap_freeipa.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
```ini
[auth.ldap]
enabled = true
config_file = conf/ldap_freeipa.toml
; allow_sign_up = true
```
@@ -1,5 +1,5 @@
graphite09:
build: blocks/graphite
build: docker/blocks/graphite
ports:
- "8080:80"
- "2003:2003"

Some files were not shown because too many files have changed in this diff Show More