Commit Graph

921 Commits

Author SHA1 Message Date
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
Trent White
e5eb1d5b78 Update direct-db-connection.md
Updated the consolidateBy sentence.
2017-07-27 12:27:01 -04:00
Trent White
370e85911f Update direct-db-connection.md 2017-07-27 12:17:53 -04:00
Trent White
5b9cf43e59 Merge pull request #1 from bulletfactory/patch-1
Update direct-db-connection.md
2017-07-27 12:15:58 -04:00
Trent White
41f80d9e40 Merge branch 'master' into patch-1 2017-07-27 12:15:41 -04:00
Trent White
1f0eb082aa Update direct-db-connection.md
I see what you're saying. Is this better? I reworded slightly and swapped a few others around.

If this isn't better, I'm happy to change again.
2017-07-27 12:07:57 -04:00
Trent White
dd469f01ae Update direct-db-connection.md
Please look over my changes before merge. I want to make sure I tweaked the wording to read a little better, but not changed the actual meaning of the sentences. Thanks!
t
2017-07-26 13:53:15 -04:00
Alexander Zobnin
4c39fec007 Update change log 2017-07-26 19:17:50 +03:00
Alexander Zobnin
dced2f0d62 bump version 2017-07-26 19:14:44 +03:00
Alexander Zobnin
e7acd9d634 check dbConnection config object, issue #436 2017-07-26 19:13:44 +03:00
Alexander Zobnin
ec272770bb Update release change log 2017-07-26 17:20:40 +03:00
Alexander Zobnin
964d6e32f4 docs: update copyright year 2017-07-26 17:17:58 +03:00
Alexander Zobnin
bb61d8fabb Bump version 2017-07-26 17:16:34 +03:00
Alexander Zobnin
16c4ab025e Update change log 2017-07-26 16:26:49 +03:00
Alexander Zobnin
122a97e482 fix sumSeries() function, closes #286 2017-07-26 16:21:40 +03:00
Alexander Zobnin
ac4a7434ce update change log 2017-07-26 14:16:54 +03:00
Alexander Zobnin
f211fdf5d4 docs: Functions usage with Direct DB Connection 2017-07-26 13:57:24 +03:00
Alexander Zobnin
e5ebdb2691 docs: movingAverage and exponentialMovingAverage reference 2017-07-26 13:37:07 +03:00
Alexander Zobnin
a641f2c9ef Merge branch 'metric-functions' 2017-07-26 13:05:09 +03:00
Alexander Zobnin
995b4401b6 mysql-connector: fix reapplying functions to targets with equal items 2017-07-26 12:54:05 +03:00