Commit Graph

1049 Commits

Author SHA1 Message Date
Torkel Ödegaard
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
Torkel Ödegaard
3105215425 feat(mixed datasource): changed how query ref ids (letters) are assigned, now they are persisted 2015-08-16 11:24:32 +02:00
Torkel Ödegaard
e916f93787 feat(mixed datasource): fixed failing unit tests 2015-08-16 10:06:36 +02:00
Torkel Ödegaard
1332ddbc93 feat(mixed datasources): updated OpenTSDB data source query editor to new model, #436 2015-08-16 09:52:45 +02:00
Torkel Ödegaard
b30dfcf28a feat(datasource): added new mixed data source 2015-08-16 01:34:09 +02:00
Torkel Ödegaard
b9cfade18c feat(mutli db query): major changes to query editor and data source handling, looks promising 2015-08-15 23:11:37 +02:00
Torkel Ödegaard
ed49962120 refactor(): began work on big design change for how data source query editors are loaded 2015-08-15 21:49:30 +02:00
Pivotal
dc9c2773cb fix test connection bug 2015-08-14 13:50:01 +08:00
Torkel Ödegaard
089508db8e fix(influxdb 0.9): removed function from function dropdown as this function does not exist in InfluxDB 0.9 2015-08-11 21:10:15 +02:00
Torkel Ödegaard
fe093c6385 feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186 2015-08-11 19:16:45 +02:00
Mitsuhiro Tanda
4f42dae3cb change behavior of dimension value suggestion 2015-08-11 20:43:34 +09:00
Mitsuhiro Tanda
deedd166db add metricFindQuery 2015-08-11 14:26:24 +09:00
Mitsuhiro Tanda
6ffab821b2 refactor suggest function 2015-08-11 14:26:18 +09:00
Mitsuhiro Tanda
6705902a94 fix style 2015-08-11 10:17:48 +09:00
Mitsuhiro Tanda
fd96e30c9c add region field in query editor 2015-08-11 10:17:39 +09:00
Torkel Ödegaard
4b849243ce Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns 2015-08-10 09:11:19 +02:00
Torkel Ödegaard
e7fc72067a refactor(influxdb): refactoring of PR 2477, added unit tests, #2477 2015-08-10 09:09:39 +02:00
Torkel Ödegaard
ca6476a57f Merge branch 'influxdb_operators' of https://github.com/thuck/grafana into thuck-influxdb_operators 2015-08-10 08:45:16 +02:00
Torkel Ödegaard
fb9f954882 fix(graphite): Fix for bug when using series ref (#A-Z) and referenced series is hidden in query editor. fixes #2484 2015-08-10 07:59:27 +02:00
Denis Doria
a4af30675d Included $col as an option for the "Alias pattern" on influxdb
With this patch it's possible to use the column name as an identifier.
This can help when we have multiple columns as it would be possible to automatic generate a legend.
Also this would help in future when grafana could support the "AS" in the query builder.
2015-08-10 00:22:08 +02:00
Torkel Ödegaard
95cad91bae Merge pull request #2482 from thuck/influxdb_fill
Including more special options for fill
2015-08-09 20:18:45 +02:00
Denis Doria
166a56828d Including more special options for fill
Included "previous" and "none" as possible values for fill.
From the influxdb documentation:
 - "previous" means the values of the previous window is used.
 - "none" means that all null values are removed.
2015-08-09 19:17:01 +02:00
Denis Doria
950d4bb24e Code style correction 2015-08-09 12:03:51 +02:00
Denis Doria
42caf02fb0 Include context for operators
Depending of the value a different set of operators will show up.
If regex only =~ and !~ will show up.
Any other value will show =, <>, <, >.
2015-08-09 11:58:08 +02:00
Denis Doria
4bd83443f8 Fixing issue for missing tag.operator
This should fix the case from when we migrate from a version that doesn't contain tag.operator.
2015-08-08 17:00:10 +02:00
Denis Doria
5a906e0f3e Fix small corner case 2015-08-08 14:40:55 +02:00
Denis Doria
a51d900da0 Fix code style and included missed semicolon 2015-08-08 13:54:01 +02:00
Denis Doria
9a9902cea9 Includes more comparators/operators for influxdb
This patch includes some missing comparators/operators for influxdb:
>  - greater than
<  - less than
<> - not equal
!~ - doesn't match against

It includes the tag.operator fields to facilitate identification of the operators on the segments.
It keeps the logic for the regex syntax; although it changes the way to validate it, to handle the new operators use case.
2015-08-08 13:31:37 +02:00
Torkel Ödegaard
0ed4744a33 influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455 2015-08-07 11:02:32 +02:00
Denis Doria
f3fc128ec3 Including non_negative_derivative function on influxdb
Since version 0.9.0 of influxdb the non_negative_derivative function
is merged, this small patch includes it as an option on grafana.
2015-08-06 10:23:52 +02:00
Mitsuhiro Tanda
6a697eed2f fix deactivating statistics bug 2015-08-06 14:41:06 +09:00
Torkel Ödegaard
41e13fab55 fix(influxdb): fix for using template variables in side alias field in influxdb 0.9 editor, fixes #2446 2015-08-05 18:42:03 +02:00
Mitsuhiro Tanda
134819cb45 fix jshint error 2015-08-06 00:05:40 +09:00
Mitsuhiro Tanda
88ce05976e add CloudWatch datasource 2015-08-05 23:10:32 +09:00
Torkel Ödegaard
775a805959 fix(): fix for cleaning up repeat panel scope for orphaned panels or duplicated panels 2015-08-04 15:15:03 +02:00
Torkel Ödegaard
dd6a34e60a fix(influxdb): very minor fix to editor, blur event for alias input caused two refresh events, fixes #2429 2015-08-03 10:18:18 +02:00
Torkel Ödegaard
7cae087eb9 fix(influxdb_09): fixed handling of regex measurement in explore queries, fixes #2415 2015-07-31 09:17:14 +02:00
Torkel Ödegaard
e108fecdd6 fix(influxdb): fixed issue with empty influxdb result object, fixes #2294 2015-07-30 10:51:26 +02:00
Torkel Ödegaard
fb81a4f318 Merge pull request #2299 from espenfjo/kairosdb-sensible-tag-values
KairosDB: Update the template functionality to cohere with the very closely related OpenTSDB plugin
2015-07-29 20:46:13 +02:00
Torkel Ödegaard
0367edf898 Merge pull request #2380 from stesie/graphite-function-removeEmptySeries
New graphite function: removeEmptySeries
2015-07-29 08:24:35 +02:00
Jacob Shafton
ce45879efb Fixes "no datapoints" from InfluxDB 0.9.1 data source
This removes usage of the `ORDER BY` clause for InfluxDB 0.9.x data
sources, which is currently not supported in the latest InfluxDB master
(0.9.1).
2015-07-20 11:13:57 -05:00
Stefan Siegl
ea623cb5a1 New graphite function removeEmptySeries 2015-07-17 12:32:29 +02:00
Mike Kobyakov
f76374cd8f fix testDatasource, which was calling performSuggestQuery instead of _performSuggestQuery 2015-07-15 12:03:22 -07:00
Torkel Ödegaard
9f6c9cd6ff fix(graphite): raw query mode (disable graphite query editor mode) is now persisted property on the query, Fixes #2328, Fixes #2307 2015-07-12 18:18:04 +02:00
Mike Kobyakov
eb88a53223 fix for a change in datasource object 2015-07-10 16:09:08 -07:00
Mike Kobyakov
76c18e50a4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	public/app/plugins/datasource/opentsdb/datasource.js
2015-07-10 15:55:45 -07:00
Torkel Ödegaard
8eee0d574c Merge branch 'influxdb-09-fields-enhancements' 2015-07-09 17:17:46 +02:00
Torkel Ödegaard
150fd869a0 Finalized work on influxdb field and func selection, #2311 2015-07-09 17:17:17 +02:00
Torkel Ödegaard
50795adcf0 feat(influxdb 0.9): field lookup and other enhancements, #2311 2015-07-09 16:36:47 +02:00
Torkel Ödegaard
3f2c1de28d fix(OpenTSDB): fixed issue with OpenTSDB and query to result matching, Fixes #2315 2015-07-09 09:00:13 +02:00
Torkel Ödegaard
597c1f6a41 feat(influxdb): began work on some influxdb enhancements, #2311 2015-07-08 17:41:36 +02:00
Espen Fjellvær Olsen
d97f24cfc3 Update QueryController to conform with OpenTSDB Controller 2015-07-08 13:00:22 +02:00
Espen Fjellvær Olsen
48975e6533 Keep QueryController up to date as well 2015-07-08 09:36:25 +02:00
Espen Fjellvær Olsen
3980d25c23 Remove superfluous whitespaces 2015-07-08 09:29:54 +02:00
Espen Fjellvær Olsen
2255cb53f0 Close the gap between the key and the value in the js objects 2015-07-08 09:29:54 +02:00
Espen Fjellvær Olsen
521072daea KairosDB: Streamline the Templating with the very related OpenTSDB plugin
Since KairosDB is a fork of OpenTSDB it makes sense to (At least for the time being) keep their code bases similar-ish.
2015-07-08 09:29:54 +02:00
Haneysmith, Nathan
f237cac074 add double quotes around tags 2015-07-07 11:56:36 -07:00
Torkel Ödegaard
af50188a60 Removed alpha notice for influxdb 0.9 data source config 2015-07-06 17:16:17 +02:00
Torkel Ödegaard
572d35506b Removed some editor srv properites from data sources, they are not needed there anymore, they are in plugin.json, Closes #2283 2015-07-06 15:58:16 +02:00
Torkel Ödegaard
19812feb62 Increased max metric suggest count to 1000 for OpenTSDB, Closes #2281 2015-07-06 09:22:34 +02:00
Torkel Ödegaard
90ecb4c544 Merge pull request #2286 from awiddersheim/fix/parenthesis_typo
Fix 'paranthesis' typo to 'parenthesis'
2015-07-06 09:03:52 +02:00
Andrew Widdersheim
e20e2117f7 Fix 'paranthesis' typo to 'parenthesis'
This typo is most noticable in the Graphite lexer error hint message.
2015-07-05 21:22:40 -04:00
Andrew Widdersheim
7f602feff4 Allow pipe ('|') in Graphite lexer
Allow for Graphite lexer to understand metric names like
'net|usage_average'.
2015-07-05 21:19:12 -04:00
gcormier9
4a9949e643 Support dot (.) in metric name
I'd like to update the regex in order to support dot in metric name. For example "cpu.usage.average".
2015-07-03 15:57:46 -04:00
Torkel Ödegaard
2ac07f12b0 Merge branch 'master' of https://github.com/williamjoy/grafana 2015-07-02 10:05:45 +02:00
Torkel Ödegaard
5494be4493 Some fixes related to OpenTSDB enhancements, #1250 2015-07-02 10:04:15 +02:00
Torkel Ödegaard
8ed0df64c7 Fixes to OpenTSDB datasource, and added support for repeat panels and repeat rows 2015-07-01 08:56:47 +02:00
Torkel Ödegaard
e508db994e OpenTSDB: Support for template variable values lookup queries, Closes #1250 2015-06-30 15:32:43 +02:00
Torkel Ödegaard
f58e228d11 Merge branch 'lexh-restrict-tag-keys-values' 2015-06-30 12:28:01 +02:00
Torkel Ödegaard
97f54ac385 Small fix to PR 2119 2015-06-30 12:27:42 +02:00
Torkel Ödegaard
15e6a4266c Fixed OR statement for influxdb 0.9 editor, #1525 2015-06-29 16:03:30 +02:00
Torkel Ödegaard
11170dd34c feat(singlestat): Added support for string values, Closes #2203 2015-06-29 09:22:08 +02:00
Torkel Ödegaard
0838f432ca refactor(influxdb series handling): performance and refactoring of PR #2179, also switched to InfluxDB epoch json format 2015-06-29 09:02:07 +02:00
Torkel Ödegaard
c0d2241523 Merge branch 'topic-multi-select-influxdb9' of https://github.com/randywallace/grafana into randywallace-topic-multi-select-influxdb9 2015-06-29 08:20:10 +02:00
Torkel Ödegaard
906e70e599 Batch all influxdb 0.9 queries (per panel) in one request, #1525 2015-06-26 11:27:49 +02:00
Torkel Ödegaard
3f167d7fd1 more work on influxdb 0.9 query editor and query builder, can now handle regex conditions, tag operator and tag value quotes changes automatically depending if the tag value is a regex or not, #1525 2015-06-26 10:38:39 +02:00
Torkel Ödegaard
43afd7dff9 Fixed on blur event for influxdb 0.9 raw query editor, #1525 2015-06-26 07:54:55 +02:00
Torkel Ödegaard
9266d3789b Merge remote-tracking branch 'origin/kariosdb'
Conflicts:
	public/test/test-main.js
2015-06-25 18:34:41 +02:00
Torkel Ödegaard
ba2deb5f7b Merge branch 'master' of github.com:grafana/grafana 2015-06-22 22:30:03 +02:00
Torkel Ödegaard
7794442277 Make influxdb 0.9 raw query mode still show alias input field, #1525 2015-06-22 22:29:49 +02:00
Marko Lahma
680865f13c #1525 add support for scoped vars for InfluxDB 0.9 2015-06-22 22:22:29 +03:00
Randy D. Wallace Jr
5e6d876bd0 Support Multiple Fields in InfluxDB 0.9+
* Update influxdb 0.9 plugin to iterate thru fields returned by InfluxDB
  and output ea. field metric separately
* Updates default label to include Field Name
* Update spec to include updated label
* Add spec for multiple fields
* Do not print the field in the label when the name is value
2015-06-17 14:43:54 -04:00
Torkel Ödegaard
2c88b418fd Fix import from elasticsearch limit, Fixes #1843, Fixes 2154 2015-06-13 20:20:48 +02:00
Lex Herbert
463a750c07 OpenTSDB: Restrict typeahead tag keys and values
When selecting metric tag keys, we only are interested in keys which are
associated with this metric. Likewise, when selecting a value for a
certain key, we only want to consider values which apply to the given
key and metric.
2015-06-04 17:45:09 -07:00
Masaori Koshiba
4d0c04b80d Add tag support 2015-06-04 01:23:58 +09:00
Masaori Koshiba
e9a842259a Add metricFindQuery in KairosDBDatasource 2015-06-03 22:55:31 +09:00
Torkel Ödegaard
50645cc36b Added test connection action to all data sources, Closes #1997 2015-06-01 14:16:59 +02:00
Torkel Ödegaard
afede880e6 added url validation when adding data source, Fixes #2043 2015-06-01 14:02:24 +02:00
Torkel Ödegaard
e2f6633d57 Began work on data source test / validation, #1997 & #2043 2015-06-01 12:15:49 +02:00
Torkel Ödegaard
96bd66e811 Made the annotation tags support more cross datasource compatible 2015-05-27 14:30:23 +02:00
Torkel Ödegaard
494ede5bbf Big refactoring/rewrite for how annotation tooltips are shown, also work on #1474 2015-05-27 13:11:32 +02:00
Torkel Ödegaard
921d672a2c Worked on alias pattern for InfluxDB 0.9 editor, #1525 2015-05-26 11:01:28 +02:00
David Raifaizen
2191921690 Fixed variable name for annotations 2015-05-21 14:36:35 -04:00
Torkel Ödegaard
ba3f6f9d3e InfluxDB 09 fix, do not treat empty results as an error 2015-05-21 10:20:49 +02:00
Torkel Ödegaard
3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 2015-05-20 14:59:38 +02:00
Torkel Ödegaard
788e7fd36d Lots of api refactoring for org routes, #2014 2015-05-19 10:16:32 +02:00
Torkel Ödegaard
5896903bd3 Began work on alias support and alias patterns for InfluxDB 0.9, #1525 2015-05-18 15:01:05 +02:00
Torkel Ödegaard
84618a6076 Style and layout changes for InfluxDB 0.9 editor #1525 2015-05-18 11:40:50 +02:00
Torkel Ödegaard
b61f30de94 Lots of progress on InfluxDB Query Editor, show tag keys, values and measurement dropdowns now take into account already selected tags or measurements, so you can start with tag keys and the select measurement, #1525 2015-05-18 10:49:45 +02:00
Masaori Koshiba
41a73a7adb Expand variables in KairosDB Plugin 2015-05-17 21:46:14 +09:00
Torkel Ödegaard
05d725d0b8 Slight refactoring, #1525 2015-05-16 22:37:08 +02:00
Torkel Ödegaard
7a41ecb63f Minor work on InfluxDB 0.9 query editor, #1525, hit a roadblock with the new InfluxDB query language, does not support tag and tag values discovery queries with filters, not sure if I need to move to SHOW SERIES style queries 2015-05-16 22:37:08 +02:00
Torkel Ödegaard
6fd37779b8 More work on new influxdb query editor, #1525 2015-05-16 22:37:08 +02:00
Torkel Ödegaard
5ca8d590bd Working on new query editor for influxdb 0.9, looking good! #1525 2015-05-15 15:58:07 +02:00
Torkel Ödegaard
11c8e80ea9 Working on new query editor for influxdb 0.9, #1525 2015-05-15 11:38:37 +02:00
Torkel Ödegaard
ea54f6923b Added graphite function changed, closes #1961 2015-05-13 16:32:33 +02:00
Anders Brander
5eee33a11f Quote 'measurement' properly in getAltSegments() to allow for dots in measurement identifier (Influxdb 0.9). 2015-05-07 19:51:55 +02:00
Torkel Ödegaard
b48b11e902 Added new graphite function spec, weightedAverage, Closes #1879 2015-05-01 08:52:34 +02:00
Torkel Ödegaard
5de9230924 Security: New config option to disable the use of gravatar for profile images, Closes #1891 2015-05-01 08:40:13 +02:00
Torkel Ödegaard
b762f56aee Merge branch 'master' into panel_repeat
Conflicts:
	public/app/features/templating/templateValuesSrv.js
2015-04-29 13:59:15 +02:00
David Raifaizen
e5844afb0f Corrected missing annotations: true tag from the influxdb9 plugin json and fixed influxseries data handling 2015-04-28 16:29:32 -04:00
Torkel Ödegaard
bf6f0f1a65 Merge branch 'master' into panel_repeat
Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html
2015-04-27 13:53:02 +02:00
Masaori Koshiba
df9403809b Fix conflict 2015-04-26 23:14:50 +09:00
Masaori Koshiba
d86814b6c5 Refactoring of tag suggestion 2015-04-26 23:02:40 +09:00
Torkel Ödegaard
87007994af Merge branch 'kairosdb-metric-text' of https://github.com/masaori335/grafana into kariosdb 2015-04-26 15:22:21 +02:00
Torkel Ödegaard
03e4afa736 Merge pull request #1882 from masaori335/kairosdb-appearance
Fix query editor appearance of KairosDB Plugin
2015-04-26 15:15:05 +02:00
Masaori Koshiba
7e044e29ba Change metric form input text
Preparation of templated dashboard support.
2015-04-26 19:31:04 +09:00
Masaori Koshiba
63ac6640e6 Merge branch 'master' into kairosdb-merge-master 2015-04-26 11:04:02 +09:00
Masaori Koshiba
5d57931060 Fix appearance of query editor 2015-04-26 00:24:04 +09:00
Masaori Koshiba
0a23a996bc Remove targetLetters 2015-04-25 16:12:10 +09:00
Mike Kobyakov
e395211654 Instead of hard-coding the OpenTsdb aggregators list, pull the supported
aggregators from the datasource directly.
2015-04-22 12:02:45 -07:00
Torkel Ödegaard
dc88fff704 Migration: Import dashboards from Elasticsearch was capped at 100, now capped at 10000, Fixes #1843 2015-04-22 07:50:23 +02:00
Torkel Ödegaard
8ff316252e Update info text in grafana test data source, Fixes #1840 2015-04-21 21:17:32 +02:00
Masaori Koshiba
c762ad8db2 Refactoring KairosDB Plugin 2015-04-21 00:48:25 +09:00
Masaori Koshiba
cc9d2fc139 Suppress LOG in test 2015-04-20 00:51:43 +09:00
Masaori Koshiba
05c27d8340 Rename 'KairosDBTargetCtrl' to 'KairosDBQueryCtrl' 2015-04-19 21:52:04 +09:00
Masaori Koshiba
d57ffad5e1 Add a space between arguments 2015-04-19 21:43:18 +09:00
William Wei
76b517b361 allow graphite metrics name contain '~'
when a metrics name contains '~', id does not impact graph display.
but you can not use grafana UI to edit metrics with realtime
graphite query.
2015-04-17 15:51:26 +08:00
Torkel Ödegaard
a446286869 Fixed issue with unsaved changes srv being triggerd by starring / unstarring a dashboard, Fixes #1795 2015-04-16 17:21:03 +02:00
Torkel Ödegaard
32275cb009 Merge pull request #1760 from masaori335/kairosdb-cleanup
Cleanup KairosDB Plugin
2015-04-12 15:37:45 +02:00
Masaori Koshiba
88bf0cdb9e Fix styles around 'function' 2015-04-12 20:51:35 +09:00
Masaori Koshiba
a2b751976e Add space before and after binary operators 2015-04-12 20:41:09 +09:00
Masaori Koshiba
ddb4b928a0 Delete MetricListToObject which never used 2015-04-12 20:28:01 +09:00
Masaori Koshiba
2b5fa599fb Fix styles warned by jshint 2015-04-12 20:28:00 +09:00
Masaori Koshiba
ae2201ef6f Add space after keywords 2015-04-12 20:28:00 +09:00
Masaori Koshiba
ed69ddedbf Fix styles warned by jscs 2015-04-12 20:27:51 +09:00
Masaori Koshiba
66f5411402 Fix class names in query.editor.html of KairosDB Plugin 2015-04-12 18:39:41 +09:00
David Raifaizen
2d016c5a3f When performing a metric find query, the InfluxDb9 datasource needs a query type in order to return results succesfully. This parameter is not available when called from the templateValuesSrv, which is causing an error 2015-04-09 12:05:18 -04:00
Torkel Ödegaard
f28af4f369 OpenTSDB: another improvement to OpenTSDB query -> query result matching 2015-04-07 21:47:06 +02:00
Torkel Ödegaard
1bd238191c OpenTSDB: better matching for query -> query result series 2015-04-07 21:42:21 +02:00
Torkel Ödegaard
01c97e69dd Updated influxdb 0.9 datasource config view to mention incomplete state of data source 2015-04-07 13:56:35 +02:00
Torkel Ödegaard
646298f5c5 Handle errors when loading dashboard with template variables that query data sources that cannot be found 2015-04-07 13:48:26 +02:00
Torkel Ödegaard
8f73328e25 Fixed datasource proxy and session timeout issue for OpenTSDB, #1667 2015-04-07 09:53:59 +02:00
Torkel Ödegaard
b5112aeee2 Data source proxy, and session timeout fix for influxdb, #1667 2015-04-07 09:50:03 +02:00
Torkel Ödegaard
22adf0d06e Datasource proxy & session timeout fix (casued 401 Unauthorized error after a while), Fixes #1667 2015-04-07 09:25:00 +02:00
Torkel Ödegaard
8e33c2c4d3 Mini work on InfluxDB 0.9 datasource, still needs a lot of work 2015-03-29 20:47:34 +02:00
Torkel Ödegaard
795cee13c8 KairosDB data source plugin is messy, needs a lot of clean up & refactoring, please help 2015-03-29 20:30:59 +02:00
Torkel Ödegaard
15188c4a88 Moved kairosdb data source to correct folder 2015-03-29 20:13:32 +02:00
Torkel Ödegaard
fde11be279 Renamed src directory to public 2015-03-29 12:57:28 +02:00