[icinga-checkins] icinga.org: icinga-core/dev/ido: cgis: clarify on deleting downtimes for hosts and all services in cmd desc #1572

git at icinga.org git at icinga.org
Wed Oct 3 01:15:24 CEST 2012


Module: icinga-core
Branch: dev/ido
Commit: 93ef7e5aee642b88753cf841abe189b9eb3a408b
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=93ef7e5aee642b88753cf841abe189b9eb3a408b

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Sun Sep 23 13:04:36 2012 +0200

cgis: clarify on deleting downtimes for hosts and all services in cmd desc #1572

this fits into the drop down on status.cgi, as well as adds more
telling text to extinfo.cgi plus the cmd.cgi help itsself.

refs #1572

---

 cgi/cmd.c     |    4 ++--
 cgi/extinfo.c |    2 +-
 cgi/status.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cgi/cmd.c b/cgi/cmd.c
index edca7c2..40b22a7 100644
--- a/cgi/cmd.c
+++ b/cgi/cmd.c
@@ -1381,8 +1381,8 @@ void request_command_data(int cmd) {
 		break;
 
 	case CMD_DEL_DOWNTIME_BY_HOST_NAME:
-                snprintf(help_text, sizeof(help_text), "This command is used to delete all downtime specified by the host name already supplied.");
-		snprintf(action, sizeof(action), "Remove all downtime for these hosts");
+                snprintf(help_text, sizeof(help_text), "This command is used to delete all downtimes for a host and all its services specified by the host name already supplied.");
+		snprintf(action, sizeof(action), "Remove downtimes for all services for these hosts and the hosts themself");
                 break;
 
 	case CMD_SCHEDULE_HOST_SVC_DOWNTIME:
diff --git a/cgi/extinfo.c b/cgi/extinfo.c
index 8f75530..66f212d 100644
--- a/cgi/extinfo.c
+++ b/cgi/extinfo.c
@@ -1680,7 +1680,7 @@ void show_host_info(void) {
 
 			printf("<tr CLASS='command'><td><img src='%s%s' border=0 ALT='Schedule Downtime For This Host and All Services' TITLE='Schedule Downtime For This Host and All Services'></td><td CLASS='command'><a href='%s?cmd_typ=%d&host=%s'>Schedule downtime for this host and all services</a></td></tr>\n", url_images_path, DOWNTIME_ICON, CMD_CGI, CMD_SCHEDULE_HOST_SVC_DOWNTIME, url_encode(host_name));
 
-			printf("<tr CLASS='command'><td><img src='%s%s' border=0 ALT='Remove All Downtime for this host' TITLE='Remove All Downtime for this host'></td><td CLASS='command'><a href='%s?cmd_typ=%d&host=%s'>Remove All Downtime for this host</a></td></tr>\n", url_images_path, DISABLED_ICON, CMD_CGI, CMD_DEL_DOWNTIME_BY_HOST_NAME, url_encode(host_name));
+			printf("<tr CLASS='command'><td><img src='%s%s' border=0 ALT='Remove Downtime(s) for this host and all services' TITLE='Remove Downtime(s) for this host and all services'></td><td CLASS='command'><a href='%s?cmd_typ=%d&host=%s'>Remove Downtime(s) for this host and all services</a></td></tr>\n", url_images_path, DISABLED_ICON, CMD_CGI, CMD_DEL_DOWNTIME_BY_HOST_NAME, url_encode(host_name));
 
 			printf("<tr CLASS='command'><td><img src='%s%s' border=0 ALT='Disable Notifications For All Services On This Host' TITLE='Disable Notifications For All Services On This Host'></td><td CLASS='command' NOWRAP><a href='%s?cmd_typ=%d&host=%s'>Disable notifications for all services on this host</a></td></tr>\n", url_images_path, DISABLED_ICON, CMD_CGI, CMD_DISABLE_HOST_SVC_NOTIFICATIONS, url_encode(host_name));
 
diff --git a/cgi/status.c b/cgi/status.c
index 299c393..99aac6c 100644
--- a/cgi/status.c
+++ b/cgi/status.c
@@ -6794,7 +6794,7 @@ void show_hostcommand_table(void) {
 		printf("<option value='%d' title='%s%s' >Delay Next Host Notification</option>\n", CMD_DELAY_HOST_NOTIFICATION, url_images_path, DELAY_ICON);
 		printf("<option value='%d' title='%s%s' >Schedule Downtime For Checked Host(s)</option>\n", CMD_SCHEDULE_HOST_DOWNTIME, url_images_path, DOWNTIME_ICON);
 		printf("<option value='%d' title='%s%s' >Schedule Downtime For Checked Host(s) and All Services</option>\n", CMD_SCHEDULE_HOST_SVC_DOWNTIME, url_images_path, DOWNTIME_ICON);
-		printf("<option value='%d' title='%s%s' >Remove All Scheduled downtime of Selected Host(s)</option>\n", CMD_DEL_DOWNTIME_BY_HOST_NAME, url_images_path, DISABLED_ICON);
+		printf("<option value='%d' title='%s%s' >Remove Downtime(s) For Checked Host(s) and All Services</option>\n", CMD_DEL_DOWNTIME_BY_HOST_NAME, url_images_path, DISABLED_ICON);
 		printf("<option value='%d' title='%s%s' >Disable Notifications For All Services On Checked Host(s)</option>\n", CMD_DISABLE_HOST_SVC_NOTIFICATIONS, url_images_path, DISABLED_ICON);
 		printf("<option value='%d' title='%s%s' >Enable Notifications For All Services On Checked Host(s)</option>\n", CMD_ENABLE_HOST_SVC_NOTIFICATIONS, url_images_path, ENABLED_ICON);
 		printf("<option value='%d' title='%s%s' >Schedule A Check Of All Services On Checked Host(s)</option>\n", CMD_SCHEDULE_HOST_SVC_CHECKS, url_images_path, DELAY_ICON);





More information about the icinga-checkins mailing list