collectd-nagios: Sort LISTVAL output.

Also, output the data for each host in a separate "section", printing the
hostname as the heading and leaving it out from any further output.

This way, the strings may directly be used as options for -H and -n.

diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c
index d6e9868c3657488f6cc2080bf51673dc97e8f8ff..88a53023fb788a7c1439d2e41bf00e71b1a0b377 100644 (file)
--- a/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@ -274,6 +274,8 @@ static int do_listval (lcc_connection_t *connection)
        lcc_identifier_t *ret_ident = NULL;
        size_t ret_ident_num = 0;
 
+       char *hostname = NULL;
+
        int status;
        size_t i;
 
@@ -285,12 +287,31 @@ static int do_listval (lcc_connection_t *connection)
                return (RET_UNKNOWN);
        }
 
+       status = lcc_sort_identifiers (connection, ret_ident, ret_ident_num);
+       if (status != 0) {
+               printf ("UNKNOWN: %s\n", lcc_strerror (connection));
+               if (ret_ident != NULL)
+                       free (ret_ident);
+               return (RET_UNKNOWN);
+       }
+
        for (i = 0; i < ret_ident_num; ++i) {
                char id[1024];
 
                if ((hostname_g != NULL) && (strcasecmp (hostname_g, ret_ident[i].host)))
                        continue;
 
+               if ((hostname == NULL) || strcasecmp (hostname, ret_ident[i].host))
+               {
+                       if (hostname != NULL)
+                               free (hostname);
+                       hostname = strdup (ret_ident[i].host);
+                       printf ("Host: %s\n", hostname);
+               }
+
+               /* empty hostname; not to be printed again */
+               ret_ident[i].host[0] = '\0';
+
                status = lcc_identifier_to_string (connection,
                                id, sizeof (id), ret_ident + i);
                if (status != 0) {
@@ -300,7 +321,8 @@ static int do_listval (lcc_connection_t *connection)
                        continue;
                }
 
-               printf ("%s\n", id);
+               /* skip over the (empty) hostname and following '/' */
+               printf ("\t%s\n", id + 1);
        }
 
        if (ret_ident != NULL)