Commit Graph

1099 Commits

Author SHA1 Message Date
Alexander Zobnin
a435ce17dc Merge branch 'develop' 2015-05-19 23:54:47 +03:00
Alexander Zobnin
3faf4be708 Improve annotations - filter trigger expression. 2015-05-19 23:54:06 +03:00
Alexander Zobnin
e49c0d2fb4 Update README.md 2015-05-18 12:55:21 +03:00
Alexander Zobnin
916ec4799f Merge branch 'develop' 2015-05-18 12:39:50 +03:00
Alexander Zobnin
8ef9c7a99f Merge branch 'feature-filters' into develop 2015-05-18 12:38:48 +03:00
Alexander Zobnin
c3b64fc2b5 Refactoring: change performZabbixAPIRequest()? deleted code duplication. 2015-05-18 12:36:43 +03:00
Alexander Zobnin
a62d0e60fc Refactoring: separate api request for each target. handleMultipleRequest() no more needed. 2015-05-18 11:45:10 +03:00
Alexander Zobnin
1158134718 Some night refactoring. 2015-05-17 22:39:30 +03:00
Alexander Zobnin
1c4b84e33b Refactoring - new handleZabbixAPIResponse method. 2015-05-17 16:16:18 +03:00
Alexander Zobnin
6c049cc161 config.html change to default. 2015-05-17 14:48:55 +03:00
Alexander Zobnin
9a52a002b1 Update README.md 2015-05-17 10:14:10 +03:00
Alexander Zobnin
e4893d7433 Merge branch 'develop'
Conflicts:
	.gitignore
	README.md
2015-05-16 20:31:07 +03:00
Alexander Zobnin
42f9141c7a Update README.md - added installation instructions for Grafana-2. 2015-05-16 20:22:25 +03:00
Alexander Zobnin
7b5f056d18 Query editor UI fixes. 2015-05-16 19:57:35 +03:00
Alexander Zobnin
b9ee409dc4 Merge branch 'develop-1.9' into develop
Conflicts:
	.gitignore
	zabbix/datasource.js
	zabbix/partials/query.editor.html
	zabbix/queryCtrl.js
2015-05-16 18:35:51 +03:00
Alexander Zobnin
2b2f997933 Implement #9 (take alias from zabbix item name). 2015-05-15 00:17:14 +03:00
Alexander Zobnin
bdae2d6e5e Fix #7 issue. 2015-05-14 23:57:36 +03:00
Alexander Zobnin
330d90053f Fix #8 and #10 issues. Remove timeseries reduce (not working properly). 2015-05-14 23:50:36 +03:00
Alexander Zobnin
69d781e698 Replace $http to backendSrv for grafana-2-like request style. 2015-05-12 22:58:34 +03:00
Alexander Zobnin
4a9885946b limitmetrics renamed to limitMetrics. 2015-05-12 20:41:10 +03:00
Alexander Zobnin
4302dc6170 Changes from grafana-1.9 branch. 2015-05-12 20:30:59 +03:00
Alexander Zobnin
f4c1daa8d0 Fix update host group, host, application and item lists. 2015-05-12 20:19:32 +03:00
Alexander Zobnin
4d733f2aad Fix "ZabbixAPIQueryCtrl not a function" error. 2015-05-12 20:18:36 +03:00
Alexander Zobnin
91f2d147ea Update README.md 2015-05-12 17:51:29 +03:00
Alexander Zobnin
efa6d756be Merge branch 'release-1.0' into develop-1.9 2015-05-12 17:32:04 +03:00
Alexander Zobnin
572bba924e Return only host groups that contain hosts. 2015-05-11 22:49:05 +03:00
Alexander Zobnin
20029dc618 Include web items in the item selection. 2015-05-11 22:41:38 +03:00
Alexander Zobnin
f953205922 Filter non-numeric items in item menu. 2015-05-10 09:23:08 +03:00
Alexander Zobnin
8ee4dd6a5c Fixed history request for multiple value type items. 2015-05-09 16:05:30 +03:00
Alexander Zobnin
f3edf17431 Merge pull request #3 from nucleusv/patch-1
Update README.md
2015-05-09 16:22:19 +04:00
nucleusv
e98441d049 Update README.md 2015-05-09 14:53:04 +03:00
Alexander Zobnin
6ea38462f6 Fixed update of host list and item list when host or item not selected. 2015-05-08 22:55:05 +03:00
Alexander Zobnin
4b44329230 Some refactoring. 2015-05-08 22:13:52 +03:00
Alexander Zobnin
594d74bf3e Merge pull request #1 from nucleusv/release-1.0.1
Rewritten ZabbixAPIDatasource.prototype.query() method.
2015-05-08 18:59:47 +04:00
nucleusv
a1d31d5458 Written ptototype.query method
This method now uses the same request doZabbixAPIRequest without code
dublication. Please check on your installation cause I have only one
metric per graph
2015-05-08 01:25:08 +03:00
Alexander Zobnin
48522b9443 Merge remote-tracking branch 'remotes/origin/master'
Conflicts:
	README.md
2015-05-07 20:56:14 +03:00
Alexander Zobnin
24fbff3c55 Update README.md - add link to releases. 2015-05-07 20:54:09 +03:00
Alexander Zobnin
20eb74f64e Update README.md - add link to releases. 2015-05-07 20:48:17 +03:00
Alexander Zobnin
bc1a3bbda8 Add installation instructions. 2015-05-07 19:21:00 +03:00
Alexander Zobnin
f11e0842db Fix host group list update. 2015-05-07 18:30:52 +03:00
Alexander Zobnin
78fb8fdfec Fix reloading query editor with no target's info. Some refactoring. 2015-05-07 16:52:05 +03:00
Alexander Zobnin
42b30d511c Update README.md 2015-05-06 13:54:56 +03:00
Alexander Zobnin
a2e1e0dfc9 Add .gitignore. 2015-05-05 18:19:04 +03:00
Alexander Zobnin
6323c962e5 Fix configs. 2015-05-05 15:46:13 +03:00
Alexander Zobnin
9d6b8608a9 Add .gitignore 2015-05-05 15:26:08 +03:00
Alexander Zobnin
b6b1b67442 Fix authorization. 2015-05-05 15:25:14 +03:00
Alexander Zobnin
e05009e466 Initial 2015-05-05 13:42:07 +03:00
Alexander Zobnin
9131a83f84 Initial 2015-05-05 13:34:00 +03:00
Alexander Zobnin
697c26e971 Initial commit 2015-05-05 13:26:38 +03:00