MEDIUM: stats: support "show info typed" on the CLI

This emits the field positions, names and types. It is more convenient
than the default output for a parser that doesn't know all the fields. It
simply relies on stats_emit_typed_data_field() and stats_emit_field_tags()
added by previous patch for the output. A new stats format flag was added,
STAT_FMT_TYPED, which is set when the "typed" keyword is specified on the
CLI.

diff --git a/include/proto/dumpstats.h b/include/proto/dumpstats.h
index 908080687cb2b9dd427b80833c9b51c846053d43..ca3357ad9ba3eaf9b921915640454b5653e2f05b 100644 (file)
--- a/include/proto/dumpstats.h
+++ b/include/proto/dumpstats.h
@@ -29,6 +29,7 @@
 
 /* Flags for applet.ctx.stats.flags */
 #define STAT_FMT_HTML   0x00000001      /* dump the stats in HTML format */
+#define STAT_FMT_TYPED  0x00000002      /* use the typed output format */
 #define STAT_HIDE_DOWN  0x00000008     /* hide 'down' servers in the stats page */
 #define STAT_NO_REFRESH 0x00000010     /* do not automatically refresh the stats page */
 #define STAT_ADMIN      0x00000020     /* indicate a stats admin level */

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 694ed2dd37248581283e641bb4c938862a80ab2a..e023865b4e29a22088135990488116cb2e2956b0 100644 (file)
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -1523,6 +1523,8 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
                        appctx->st0 = STAT_CLI_O_STAT; // stats_dump_stat_to_buffer
                }
                else if (strcmp(args[1], "info") == 0) {
+                       if (strcmp(args[2], "typed") == 0)
+                               appctx->ctx.stats.flags |= STAT_FMT_TYPED;
                        appctx->st2 = STAT_ST_INIT;
                        appctx->st0 = STAT_CLI_O_INFO; // stats_dump_info_to_buffer
                }
@@ -3075,6 +3077,27 @@ static int stats_dump_info_fields(struct chunk *out, const struct field *info)
        return 1;
 }
 
+/* Dump all fields from <info> into <out> using the "show info typed" format */
+static int stats_dump_typed_info_fields(struct chunk *out, const struct field *info)
+{
+       int field;
+
+       for (field = 0; field < INF_TOTAL_FIELDS; field++) {
+               if (!field_format(info, field))
+                       continue;
+
+               if (!chunk_appendf(out, "%d.%s.%u:", field, info_field_names[field], info[INF_PROCESS_NUM].u.u32))
+                       return 0;
+               if (!stats_emit_field_tags(out, &info[field], ':'))
+                       return 0;
+               if (!stats_emit_typed_data_field(out, &info[field]))
+                       return 0;
+               if (!chunk_strcat(out, "\n"))
+                       return 0;
+       }
+       return 1;
+}
+
 /* This function dumps information onto the stream interface's read buffer.
  * It returns 0 as long as it does not complete, non-zero upon completion.
  * No state is used.
@@ -3083,6 +3106,7 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
 {
        unsigned int up = (now.tv_sec - start_date.tv_sec);
        struct chunk *out = get_trash_chunk();
+       struct appctx *appctx = __objt_appctx(si->end);
 
 #ifdef USE_OPENSSL
        int ssl_sess_rate = read_freq_ctr(&global.ssl_per_sec);
@@ -3163,7 +3187,11 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
                info[INF_DESCRIPTION]            = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.desc);
 
        chunk_reset(&trash);
-       stats_dump_info_fields(&trash, info);
+
+       if (appctx->ctx.stats.flags & STAT_FMT_TYPED)
+               stats_dump_typed_info_fields(&trash, info);
+       else
+               stats_dump_info_fields(&trash, info);
 
        if (bi_putchk(si_ic(si), &trash) == -1) {
                si_applet_cant_put(si);