akotynski
|
d5c8dba61f
|
fix dist folder after merging conflicts
|
2017-10-23 14:29:05 +02:00 |
|
akotynski
|
0ab31e59f8
|
Merge remote-tracking branch 'upstream/master' into threshold_regex
# Conflicts:
# dist/datasource-zabbix/datasource.js
# dist/datasource-zabbix/datasource.js.map
# dist/datasource-zabbix/specs/test-main.js
# dist/test/datasource-zabbix/datasource.js
# dist/test/datasource-zabbix/specs/test-main.js
|
2017-10-23 14:26:46 +02:00 |
|
akotynski
|
eb1ef06ae7
|
upgrade jsdom to newest version so contextify is no longer required, add travis
|
2017-10-23 14:05:49 +02:00 |
|
akotynski
|
a15d704b86
|
return thresholds for expressions with less/greater than or equal
|
2017-10-23 13:42:47 +02:00 |
|
Alexander Zobnin
|
61cedec61a
|
add help for triggers editor mode
|
2017-10-23 12:15:27 +03:00 |
|
Alexander Zobnin
|
e2fd7d895c
|
bump version to 3.7.0
|
2017-10-22 20:04:42 +03:00 |
|
Alexander Zobnin
|
b6849046aa
|
update built-in dashboards
|
2017-10-22 20:01:22 +03:00 |
|
Alexander Zobnin
|
6162278718
|
add "Zabbix System Status" example dashboard
|
2017-10-22 20:00:58 +03:00 |
|
Alexander Zobnin
|
44610bbb71
|
fix query editor
|
2017-10-22 19:12:12 +03:00 |
|
Alexander Zobnin
|
3e57b5479c
|
fix tests
|
2017-10-22 19:09:21 +03:00 |
|
Alexander Zobnin
|
fddc520d8f
|
update change log
|
2017-10-22 19:05:54 +03:00 |
|
Alexander Zobnin
|
1f5e261d4a
|
table mode with triggers stats, #141
|
2017-10-22 19:01:46 +03:00 |
|
Alexander Zobnin
|
6c64f21b1a
|
Triggers query mode, allow to get active triggers count, #141
|
2017-10-22 14:30:54 +03:00 |
|
Alexander Zobnin
|
dacc3f3576
|
minor ds init refactor
|
2017-10-22 12:24:25 +03:00 |
|
Alexander Zobnin
|
df64c190e2
|
fix Zabbix API error message
|
2017-10-22 11:37:17 +03:00 |
|
Alexander Zobnin
|
538589b99b
|
docs: update db connection docs
|
2017-10-22 11:06:48 +03:00 |
|
Alexander Zobnin
|
c8205b30c3
|
update change log
|
2017-10-18 16:25:13 +03:00 |
|
Alexander Zobnin
|
a65daa5cdf
|
Add data source help and max data points param for grafana 4.5+
|
2017-10-18 16:22:55 +03:00 |
|
Alexander Zobnin
|
33cdd17b9b
|
postgres: simplify db queries
|
2017-10-18 15:31:03 +03:00 |
|
Alexander Zobnin
|
fb797325d0
|
Merge branch 'postgres-support'
|
2017-10-17 19:52:23 +03:00 |
|
Alexander Zobnin
|
8de716bc74
|
update change log
|
2017-10-17 19:51:56 +03:00 |
|
Alexander Zobnin
|
1ad2333907
|
postgres: add char format for itemid
|
2017-10-17 19:36:24 +03:00 |
|
Alexander Zobnin
|
3341b8f1f9
|
db-connector: initial postgres support
|
2017-10-17 19:30:18 +03:00 |
|
Alexander Zobnin
|
b4868aac9e
|
Merge branch 'Verivox-GmbH-feature/sortseries'
|
2017-10-16 15:37:16 +03:00 |
|
Alexander Zobnin
|
6aa7dc6c8f
|
sortSeries: build dist
|
2017-10-16 15:36:57 +03:00 |
|
Alexander Zobnin
|
462fa88965
|
Merge branch 'feature/sortseries' of https://github.com/Verivox-GmbH/grafana-zabbix into Verivox-GmbH-feature/sortseries
|
2017-10-16 15:31:11 +03:00 |
|
Alexander Zobnin
|
ba95ec078c
|
Merge branch 'pedrohrf-master'
|
2017-10-16 15:25:28 +03:00 |
|
Alexander Zobnin
|
f53eac6f08
|
percentil: refactor
|
2017-10-16 15:25:02 +03:00 |
|
Alexander Zobnin
|
872f1ac9c8
|
Merge branch 'master' of https://github.com/pedrohrf/grafana-zabbix into pedrohrf-master
|
2017-10-16 14:57:43 +03:00 |
|
Alexander Zobnin
|
44f729e60b
|
build dist
|
2017-10-16 14:39:00 +03:00 |
|
Alexander Zobnin
|
626df87d6f
|
Merge branch 'Tony-Mc-issue-352_application_selection'
|
2017-10-16 14:37:06 +03:00 |
|
Alexander Zobnin
|
85792ae6e9
|
Merge branch 'issue-352_application_selection' of https://github.com/Tony-Mc/grafana-zabbix into Tony-Mc-issue-352_application_selection
|
2017-10-16 14:34:47 +03:00 |
|
Alexander Zobnin
|
630dd17659
|
fix tether-drop dependency after moving Grafana to webpack
|
2017-10-11 20:04:49 +03:00 |
|
Marcel Dorenkamp
|
46f35ee126
|
added grunt-cli to devdependencies
|
2017-10-10 10:33:32 +02:00 |
|
Marcel Dorenkamp
|
397bd673f8
|
added dev dependencies, build command
|
2017-10-10 10:27:28 +02:00 |
|
Marcel Dorenkamp
|
13f6fa8183
|
added sortSeries function
|
2017-10-10 10:23:03 +02:00 |
|
Tony
|
264658f0e8
|
Request extended output for applications from service
|
2017-09-15 20:08:37 +03:00 |
|
Alexander Zobnin
|
2bf984c16b
|
Merge branch 'docs'
|
2017-09-13 10:48:15 +03:00 |
|
Alexander Zobnin
|
0876aae27d
|
docs: tweak functions list styles
|
2017-09-13 10:47:54 +03:00 |
|
Alexander Zobnin
|
35f89bf97a
|
mysql-connector: fix GROUP BY clause for working with MySQL 5.7, issue #445
|
2017-09-11 18:42:37 +03:00 |
|
Alexander Zobnin
|
456962a7b6
|
docs: adjust styles
|
2017-08-02 21:57:45 +03:00 |
|
Alexander Zobnin
|
a0bc23312c
|
docs: more styles tweaks
|
2017-07-29 19:24:14 +03:00 |
|
Alexander Zobnin
|
4baaf5f34c
|
docs css: functions list tweaks
|
2017-07-29 18:09:50 +03:00 |
|
Alexander Zobnin
|
653de7cea9
|
Update function list formatting
|
2017-07-29 18:04:58 +03:00 |
|
Alexander Zobnin
|
b96cafcb5d
|
docs styles tweaks
|
2017-07-29 17:12:31 +03:00 |
|
Alexander Zobnin
|
0a2261f682
|
Merge branch 'ma-tty-groupBy_perf_outside_range'
|
2017-07-28 12:52:06 +03:00 |
|
Alexander Zobnin
|
e626ce4ca2
|
groupBy(): minor refactor
|
2017-07-28 12:42:49 +03:00 |
|
Alexander Zobnin
|
1899d32152
|
Merge branch 'groupBy_perf_outside_range' of https://github.com/ma-tty/grafana-zabbix into ma-tty-groupBy_perf_outside_range
|
2017-07-28 12:35:03 +03:00 |
|
Alexander Zobnin
|
0291264d6b
|
Merge pull request #437 from bulletfactory/patch-1
Update direct-db-connection.md
|
2017-07-27 19:34:47 +03:00 |
|
Trent White
|
58eae76a52
|
Merge branch 'master' into patch-1
|
2017-07-27 12:28:27 -04:00 |
|