From: Florian Forster Date: Thu, 9 Sep 2010 06:30:32 +0000 (+0200) Subject: graph_data_json action: Implemented action to query graph data via JSON. X-Git-Tag: v4.0.0~35 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=643c2293a8b65f8970e3ef9ea288b20d117592f2;p=collection4.git graph_data_json action: Implemented action to query graph data via JSON. --- diff --git a/src/Makefile.am b/src/Makefile.am index 2923d04..96bbae7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ bin_PROGRAMS = collection.fcgi collection_fcgi_SOURCES = main.c \ oconfig.c oconfig.h aux_types.h scanner.l parser.y \ action_graph.c action_graph.h \ + action_graph_data_json.c action_graph_data_json.h \ action_graph_def_json.c action_graph_def_json.h \ action_list_graphs.c action_list_graphs.h \ action_list_hosts.c action_list_hosts.h \ diff --git a/src/action_graph_data_json.c b/src/action_graph_data_json.c new file mode 100644 index 0000000..388befd --- /dev/null +++ b/src/action_graph_data_json.c @@ -0,0 +1,128 @@ +/** + * collection4 - action_graph_data_json.c + * Copyright (C) 2010 Florian octo Forster + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Florian octo Forster + **/ + +#include +#include +#include +#include +#include +#include +#include + +#include "action_graph_data_json.h" +#include "common.h" +#include "graph.h" +#include "graph_instance.h" +#include "graph_list.h" +#include "utils_cgi.h" + +#include +#include + +/* Expire data after one day. */ +#define EXPIRES_SECS 86400 + +static void write_callback (__attribute__((unused)) void *ctx, /* {{{ */ + const char *str, unsigned int len) +{ + fwrite ((void *) str, /* size = */ len, /* nmemb = */ 1, stdout); +} /* }}} void write_callback */ + +int action_graph_data_json (void) /* {{{ */ +{ + graph_config_t *cfg; + graph_instance_t *inst; + + time_t tt_begin = 0; + time_t tt_end = 0; + time_t tt_now = 0; + + dp_time_t dp_begin = { 0, 0 }; + dp_time_t dp_end = { 0, 0 }; + + yajl_gen_config handler_config; + yajl_gen handler; + + time_t expires; + char time_buffer[128]; + int status; + + cfg = gl_graph_get_selected (); + if (cfg == NULL) + return (ENOMEM); + + inst = inst_get_selected (cfg); + if (inst == NULL) + return (EINVAL); + + /* Get selected time(s) */ + tt_begin = tt_end = tt_now = 0; + status = get_time_args (&tt_begin, &tt_end, &tt_now); + if (status != 0) + return (status); + + dp_begin.tv_sec = tt_begin; + dp_begin.tv_nsec = 0; + dp_end.tv_sec = tt_end; + dp_end.tv_nsec = 0; + + memset (&handler_config, 0, sizeof (handler_config)); + handler_config.beautify = 0; + handler_config.indentString = " "; + + handler = yajl_gen_alloc2 (write_callback, + &handler_config, + /* alloc functions = */ NULL, + /* context = */ NULL); + if (handler == NULL) + { + graph_destroy (cfg); + return (-1); + } + + printf ("Content-Type: application/json\n"); + + /* By default, permit caching until 1/1000th after the last data. If that + * data is in the past, assume the entire data is in the past and allow + * caching for one day. */ + expires = tt_end + ((tt_end - tt_begin) / 1000); + if (expires < tt_now) + expires = tt_now + 86400; + + status = time_to_rfc1123 (expires, time_buffer, sizeof (time_buffer)); + if (status == 0) + printf ("Expires: %s\n" + "Cache-Control: public\n", + time_buffer); + printf ("\n"); + + status = inst_data_to_json (inst, + dp_begin, dp_end, handler); + + graph_destroy (cfg); + yajl_gen_free (handler); + + return (status); +} /* }}} int action_graph_data_json */ + +/* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/src/action_graph_data_json.h b/src/action_graph_data_json.h new file mode 100644 index 0000000..1da9571 --- /dev/null +++ b/src/action_graph_data_json.h @@ -0,0 +1,30 @@ +/** + * collection4 - action_graph_data_json.h + * Copyright (C) 2010 Florian octo Forster + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Florian octo Forster + **/ + +#ifndef ACTION_GRAPH_DATA_JSON_H +#define ACTION_GRAPH_DATA_JSON_H 1 + +int action_graph_data_json (void); + +#endif /* ACTION_GRAPH_DATA_JSON_H */ +/* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/src/main.c b/src/main.c index b370e4c..2d05baa 100644 --- a/src/main.c +++ b/src/main.c @@ -37,6 +37,7 @@ #include "utils_cgi.h" #include "action_graph.h" +#include "action_graph_data_json.h" #include "action_graph_def_json.h" #include "action_list_graphs.h" #include "action_list_hosts.h" @@ -63,6 +64,7 @@ static int action_usage (void); static const action_t actions[] = { { "graph", action_graph }, + { "graph_data_json", action_graph_data_json }, { "graph_def_json", action_graph_def_json }, { "list_graphs", action_list_graphs }, { "list_hosts", action_list_hosts },