IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,783 Commits 5,454 Branches 554 Tags 1.9 GiB
bb227d5c3a
Commit Graph

6667 Commits

Author SHA1 Message Date
Daniel Lee
296fd35d47 stackdriver: add help section for annotations 2018-09-28 19:12:50 +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
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
Erik Sundell
4abd04a5cf stackdriver: use correct default value for alignment period 2018-09-28 15:23:13 +02:00
Erik Sundell
f384e577dd stackdriver: fix reducer names 2018-09-28 15:11:33 +02:00
Peter Holmberg
da856187d8 snaps 2018-09-28 14:57:56 +02:00
Peter Holmberg
21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +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
Peter Holmberg
166f93cf54 components, test, removed old not used files 2018-09-28 11:05:34 +02:00
Steve Kreitzer
55e4db5cfc Adding AWS Isolated Regions 2018-09-27 19:58:07 -04: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
Daniel Lee
03b43ab769 stackdriver: wip annotation support 2018-09-27 15:18:10 +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
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
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
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
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
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
Daniel Lee
66c95991c1 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-26 17:59:56 +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
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
Erik Sundell
af9033f3e0 stackdriver: distinct grafana auto from stackdriver auto in alignment period 2018-09-26 15:44:09 +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
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
Daniel Lee
0a77cd5569 stackdriver: adds on-change with debounce for alias by field 2018-09-26 00:33:18 +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
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
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
Peter Holmberg
bb20e5cb94 created test for graph disclaimer 2018-09-25 11:50:55 +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
Peter Holmberg
ecf08b060c limit number of time series show in explore graph 2018-09-24 16:35:24 +02:00
Daniel Lee
1aba5f814b stackdriver: fix test after parameter added to constructor 2018-09-24 16:05:16 +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
Patrick O'Carroll
daffa7d067 removed border, cleaned up css and fixed class naming 2018-09-24 12:49:29 +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
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
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
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
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
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
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
785f35b1c9 Merge branch 'master' of github.com:grafana/grafana 2018-09-21 09:24:03 +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
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
c67327d768 Merge branch 'master' of github.com:grafana/grafana 2018-09-19 17:45:58 +02: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
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
Daniel Lee
e05b86375b stackdriver: remove hardcoding of test project name 2018-09-18 16:02:38 +02:00
Erik Sundell
7b8ea5fc54 stackdriver: improve query look 2018-09-17 17:34:01 +02:00
Erik Sundell
cfb8017567 stackdriver: add alignment period to query controller 2018-09-17 17:16:14 +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
Erik Sundell
f243da756b stackdriver: fix init labels bug 2018-09-17 11:28:10 +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
b2833daf32
Merge pull request #13285 from marefr/team_member_ext 
Team member labels
 2018-09-17 09:14:06 +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
3f309ff5dd rename folder 2018-09-15 04:50:22 -07: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
Marcus Efraimsson
da68b858d7
display team member labels 2018-09-14 17:28:34 +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
Erik Sundell
fa6e31c6d5 stackdriver: adds null check to query 2018-09-14 17:01:27 +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
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
Erik Sundell
9b4a25ed21 stackdriver: fixes remove option in filter 2018-09-14 11:24:02 +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