Commit Graph

24 Commits

Author SHA1 Message Date
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
2015-06-16 17:12:51 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
2015-06-12 14:42:49 +02:00
Alexander A. Klimov a9ea6a7c9a Don't use non-existent Format::timeSince()
fixes #9400
2015-06-10 17:50:37 +02:00
Alexander A. Klimov 98b2699e35 Documentation: use command line arguments in the format --arg=<value>
refs #8472
2015-06-10 17:20:27 +02:00
Eric Lippmann 0f70701034 Use timeSince() in the monitoring list command
refs #6778
2015-04-15 15:46:12 +02:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba.
2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Johannes Meyer 196b6a4875 Ensure that Zend is loaded when showing status information in the CLI
fixes #7869
2014-12-09 15:38:13 +01:00
Thomas Gelf 96925487bd CLI/monitoring/list: fix DataView-related exception
This uses the renamed DataView serviceStatus instead of the former
status and fixes the problem that CLI still assumed to have fetch
and count function on the DataView.

fixes #6777
2014-07-31 17:24:56 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer ec2d1daa6b Perfdata plugin should also have a knowledge about labels
Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.

refs #6515
2014-07-11 16:31:00 +02:00
Thomas Gelf d66055bce2 CLI/monitoring/list: fix formatting-related error
Small fix, this got broken by language-related changes in a66a1a47.
2014-06-04 21:25:26 +00:00
Gunnar Beutner a66a1a4729 Refactor the timeSincePrefix and timeUntilPrefix functions
Instead of having two separate functions to get the prefix
and the formatted time interval the new functions return
both the prefix and the time interval.

refs #5981
2014-05-29 13:03:10 +02:00
Gunnar Beutner d01a98b7e6 Fix some of the time-related grammar mistakes
This updates some of the messages to use "For"
instead of "Since" where appropriate.

fixes #5981
2014-05-29 11:30:08 +02:00
Johannes Meyer 0627d954ac Fix usages of Icinga\Module\Monitoring\Plugin\*
refs #5973
2014-05-05 16:16:45 +02:00
Michael Friedrich 4ce7ea503f Rename help and documentation to icingacli.
Refs #5802
2014-03-19 17:25:53 +01:00
Alexander Klimov b410ebeed6 Remove unnecessary spaces at end of line 2014-03-06 13:08:11 +01:00
Thomas Gelf 385488c5df Blinking conference command 2013-10-22 20:39:54 +00:00
Thomas Gelf 7893572319 Added perfdata to CLI monitoring list command, still disabled 2013-10-22 20:38:16 +00:00
Thomas Gelf c820336df8 The amazing monitoring conference command 2013-10-22 15:52:51 +00:00
Thomas Gelf f2be16621b Move list documentation to default action unless help supports default 2013-10-22 13:53:58 +00:00
Thomas Gelf a25cd80ec0 CLI interface: initial import 2013-10-22 12:26:45 +00:00