collection4.git
9 years agosrc/graph_instance.c: Properly escape parameters.
Florian Forster [Wed, 28 Jul 2010 16:02:26 +0000 (18:02 +0200)]
src/graph_instance.c: Properly escape parameters.

9 years ago"show instance" action: Don't free "inst".
Florian Forster [Wed, 28 Jul 2010 16:02:07 +0000 (18:02 +0200)]
"show instance" action: Don't free "inst".

9 years agosrc/utils_cgi.c: Implement "uri_escape_buffer".
Florian Forster [Wed, 28 Jul 2010 16:01:45 +0000 (18:01 +0200)]
src/utils_cgi.c: Implement "uri_escape_buffer".

9 years ago"show graph" action: Actively query the selected instance.
Florian Forster [Wed, 28 Jul 2010 15:38:29 +0000 (17:38 +0200)]
"show graph" action: Actively query the selected instance.

9 years ago"show instance" action: Add link to current host.
Florian Forster [Wed, 28 Jul 2010 15:29:15 +0000 (17:29 +0200)]
"show instance" action: Add link to current host.

9 years agosrc/utils_search.[ch]: Implement "search_from_ident".
Florian Forster [Wed, 28 Jul 2010 15:15:57 +0000 (17:15 +0200)]
src/utils_search.[ch]: Implement "search_from_ident".

9 years ago"list graphs" action: Add link to display dynamic graphs, too.
Florian Forster [Wed, 28 Jul 2010 14:56:32 +0000 (16:56 +0200)]
"list graphs" action: Add link to display dynamic graphs, too.

9 years ago"list graphs" action: List only configured graphs by default.
Florian Forster [Wed, 28 Jul 2010 14:51:21 +0000 (16:51 +0200)]
"list graphs" action: List only configured graphs by default.

9 years agosrc/graph_list.c: Add some diagnostic output.
Florian Forster [Wed, 28 Jul 2010 12:21:07 +0000 (14:21 +0200)]
src/graph_list.c: Add some diagnostic output.

9 years agosrc/main.c: Flush and close STDOUT before calling gl_update().
Florian Forster [Wed, 28 Jul 2010 10:15:12 +0000 (12:15 +0200)]
src/main.c: Flush and close STDOUT before calling gl_update().

This hopefully signals the browser that the request is done
before doing the maintenance work.

9 years agosrc/graph_list.c: Only write the cache after processing a request.
Florian Forster [Wed, 28 Jul 2010 10:14:00 +0000 (12:14 +0200)]
src/graph_list.c: Only write the cache after processing a request.

9 years agosrc/graph_list.c: Supply create mode to open(2).
Florian Forster [Wed, 28 Jul 2010 08:30:35 +0000 (10:30 +0200)]
src/graph_list.c: Supply create mode to open(2).

9 years agoMerge remote branch 'origin/master'
Florian Forster [Wed, 28 Jul 2010 08:21:05 +0000 (10:21 +0200)]
Merge remote branch 'origin/master'

Conflicts:
src/main.c

9 years agosrc/graph_def.c: Only replace the ALL token.
Florian Forster [Wed, 28 Jul 2010 08:19:55 +0000 (10:19 +0200)]
src/graph_def.c: Only replace the ALL token.

9 years agoRemove call to "gl_update()" from various actions.
Florian Forster [Thu, 22 Jul 2010 14:42:38 +0000 (16:42 +0200)]
Remove call to "gl_update()" from various actions.

It's now handled in src/main.c

9 years agosrc/graph_list.[ch]: Fix parsing the JSON cache.
Florian Forster [Thu, 22 Jul 2010 14:38:28 +0000 (16:38 +0200)]
src/graph_list.[ch]: Fix parsing the JSON cache.

9 years agosrc/graph_list.[ch]: Fix parsing the JSON cache.
Florian Forster [Thu, 22 Jul 2010 14:36:49 +0000 (16:36 +0200)]
src/graph_list.[ch]: Fix parsing the JSON cache.

9 years agosrc/graph_list.c: A first take at a JSON parser for reading back the cache file.
Florian Forster [Wed, 21 Jul 2010 14:23:25 +0000 (16:23 +0200)]
src/graph_list.c: A first take at a JSON parser for reading back the cache file.

It's UNTESTED!

9 years agosrc/graph.[ch]: Implement "graph_add_inst".
Florian Forster [Wed, 21 Jul 2010 14:20:31 +0000 (16:20 +0200)]
src/graph.[ch]: Implement "graph_add_inst".

9 years ago"show_graph_json" action: Use the callback interface of yajl.
Florian Forster [Wed, 21 Jul 2010 11:56:10 +0000 (13:56 +0200)]
"show_graph_json" action: Use the callback interface of yajl.

9 years agosrc/graph_list.c: First take at writing the graph list to disk.
Florian Forster [Wed, 21 Jul 2010 11:42:02 +0000 (13:42 +0200)]
src/graph_list.c: First take at writing the graph list to disk.

9 years agoFix printing of JSON values.
Florian Forster [Wed, 21 Jul 2010 09:59:26 +0000 (11:59 +0200)]
Fix printing of JSON values.

9 years ago"show_graph_json" action: Update for the new interface.
Florian Forster [Wed, 21 Jul 2010 09:30:39 +0000 (11:30 +0200)]
"show_graph_json" action: Update for the new interface.

9 years agosrc/graph.[ch]: Implement "graph_to_json".
Florian Forster [Wed, 21 Jul 2010 09:30:14 +0000 (11:30 +0200)]
src/graph.[ch]: Implement "graph_to_json".

9 years agosrc/graph_instance.[ch]: Implement "inst_to_json".
Florian Forster [Wed, 21 Jul 2010 09:29:50 +0000 (11:29 +0200)]
src/graph_instance.[ch]: Implement "inst_to_json".

9 years agosrc/graph_ident.[ch]: Generate JSON data using libyajl.
Florian Forster [Wed, 21 Jul 2010 09:05:23 +0000 (11:05 +0200)]
src/graph_ident.[ch]: Generate JSON data using libyajl.

9 years agoconfigure.ac: Check for yajl.
Florian Forster [Wed, 21 Jul 2010 08:51:45 +0000 (10:51 +0200)]
configure.ac: Check for yajl.

9 years agoshare/collection.conf: Demonstrate the new functionality with "mysql_command" graphs.
Florian Forster [Wed, 14 Jul 2010 15:57:05 +0000 (17:57 +0200)]
share/collection.conf: Demonstrate the new functionality with "mysql_command" graphs.

9 years agosrc/graph_def.c: Add error messages to "def_create".
Florian Forster [Wed, 14 Jul 2010 15:56:36 +0000 (17:56 +0200)]
src/graph_def.c: Add error messages to "def_create".

9 years agosrc/graph_def.c: Make it possible for one "DEF" to handle multiple files correctly.
Florian Forster [Wed, 14 Jul 2010 15:55:38 +0000 (17:55 +0200)]
src/graph_def.c: Make it possible for one "DEF" to handle multiple files correctly.

9 years agosrc/graph_def.c: Use "ident_describe" to generate a legend entry …
Florian Forster [Wed, 14 Jul 2010 15:01:33 +0000 (17:01 +0200)]
src/graph_def.c: Use "ident_describe" to generate a legend entry …

… if no legend has been specified. Using the DS name here isn't as good
since often many files of the same type are grouped together.

9 years agosrc/graph_instance.c: inst_describe: Use the new "ident_describe" function.
Florian Forster [Wed, 14 Jul 2010 14:50:36 +0000 (16:50 +0200)]
src/graph_instance.c: inst_describe: Use the new "ident_describe" function.

9 years agosrc/graph_ident.[ch]: Implement "ident_describe".
Florian Forster [Wed, 14 Jul 2010 14:49:20 +0000 (16:49 +0200)]
src/graph_ident.[ch]: Implement "ident_describe".

9 years agoshare/collection.conf: Make the disk graphs more generic.
Florian Forster [Wed, 14 Jul 2010 09:35:30 +0000 (11:35 +0200)]
share/collection.conf: Make the disk graphs more generic.

By removing the "disk" plugin name. Other plugins, for example the
NetApp plugin, create such graphs, too.

9 years agoshare/collection.conf: Add a couple more generic graphs.
Florian Forster [Wed, 14 Jul 2010 09:35:00 +0000 (11:35 +0200)]
share/collection.conf: Add a couple more generic graphs.

9 years ago"search" action: Use the new search infrastructure.
Florian Forster [Wed, 14 Jul 2010 08:57:51 +0000 (10:57 +0200)]
"search" action: Use the new search infrastructure.

9 years agosrc/graph.c: Fix "graph_search_inst".
Florian Forster [Wed, 14 Jul 2010 08:57:18 +0000 (10:57 +0200)]
src/graph.c: Fix "graph_search_inst".

Checking if a graph selector intersects with the search selector is not
sufficient, because the instance may introduce a contradiction.

The "graph_search_inst_noselector" has been introduced to simplify the
(probably common) case of no search selector being present.

9 years agosrc/graph_list.c: Only call "graph_ident_intersect" if the search has an ident.
Florian Forster [Wed, 14 Jul 2010 08:53:49 +0000 (10:53 +0200)]
src/graph_list.c: Only call "graph_ident_intersect" if the search has an ident.

9 years agosrc/utils_search.[ch]: Implement "search_has_selector".
Florian Forster [Wed, 14 Jul 2010 08:18:26 +0000 (10:18 +0200)]
src/utils_search.[ch]: Implement "search_has_selector".

9 years agosrc/graph_list.c: Use the new "graph_ident_intersect" function.
Florian Forster [Mon, 12 Jul 2010 17:00:16 +0000 (19:00 +0200)]
src/graph_list.c: Use the new "graph_ident_intersect" function.

The (slightly advanced) search appears to work now.

9 years agosrc/graph.[ch]: Implement "graph_ident_intersect".
Florian Forster [Mon, 12 Jul 2010 16:58:30 +0000 (18:58 +0200)]
src/graph.[ch]: Implement "graph_ident_intersect".

9 years agosrc/graph_ident.[ch]: Implement "ident_intersect".
Florian Forster [Mon, 12 Jul 2010 16:55:07 +0000 (18:55 +0200)]
src/graph_ident.[ch]: Implement "ident_intersect".

9 years agosrc/graph_list.[ch]: Implement "gl_search".
Florian Forster [Mon, 12 Jul 2010 09:44:47 +0000 (11:44 +0200)]
src/graph_list.[ch]: Implement "gl_search".

9 years agosrc/utils_search.[ch]: Implement "search_to_ident" and "search_graph_title_matches".
Florian Forster [Mon, 12 Jul 2010 09:44:12 +0000 (11:44 +0200)]
src/utils_search.[ch]: Implement "search_to_ident" and "search_graph_title_matches".

The "title" argument has been added to the "search_graph_inst_matches" function, too.

9 years agosrc/graph.[ch]: Implement "graph_search_inst".
Florian Forster [Mon, 12 Jul 2010 09:42:58 +0000 (11:42 +0200)]
src/graph.[ch]: Implement "graph_search_inst".

9 years agosrc/graph.[ch]: Rename "graph_inst_search" to "graph_search_inst_string".
Florian Forster [Mon, 12 Jul 2010 09:31:21 +0000 (11:31 +0200)]
src/graph.[ch]: Rename "graph_inst_search" to "graph_search_inst_string".

9 years agosrc/graph.[ch]: Implement "graph_matches_ident".
Florian Forster [Mon, 12 Jul 2010 09:28:04 +0000 (11:28 +0200)]
src/graph.[ch]: Implement "graph_matches_ident".

9 years agosrc/graph.[ch]: Rename "graph_matches_ident" to "graph_ident_matches".
Florian Forster [Mon, 12 Jul 2010 09:26:14 +0000 (11:26 +0200)]
src/graph.[ch]: Rename "graph_matches_ident" to "graph_ident_matches".

9 years agosrc/utils_array.h: Note that the parameter may / must be freed by the caller.
Florian Forster [Mon, 12 Jul 2010 08:34:59 +0000 (10:34 +0200)]
src/utils_array.h: Note that the parameter may / must be freed by the caller.

9 years agosrc/graph_list.[ch]: Rename "gl_search" to "gl_search_string".
Florian Forster [Mon, 12 Jul 2010 08:34:23 +0000 (10:34 +0200)]
src/graph_list.[ch]: Rename "gl_search" to "gl_search_string".

9 years agosrc/utils_search.h: Implement "search_graph_inst_matches".
Florian Forster [Mon, 12 Jul 2010 08:31:35 +0000 (10:31 +0200)]
src/utils_search.h: Implement "search_graph_inst_matches".

9 years agosrc/utils_search.c: Add folding markers.
Florian Forster [Mon, 12 Jul 2010 07:59:11 +0000 (09:59 +0200)]
src/utils_search.c: Add folding markers.

9 years agosrc/utils_cgi.c: uri_unescape_copy: Fix a potential buffer overflow.
Florian Forster [Mon, 12 Jul 2010 07:56:02 +0000 (09:56 +0200)]
src/utils_cgi.c: uri_unescape_copy: Fix a potential buffer overflow.

9 years agosrc/utils_search.c: Implement parsing of the tokens.
Florian Forster [Mon, 12 Jul 2010 07:55:17 +0000 (09:55 +0200)]
src/utils_search.c: Implement parsing of the tokens.

9 years agosrc/utils_search.[ch]: Add a module for parsing search strings.
Florian Forster [Mon, 12 Jul 2010 07:40:31 +0000 (09:40 +0200)]
src/utils_search.[ch]: Add a module for parsing search strings.

9 years ago"list graphs" and "list hosts" actions: Add links to the "search" action.
Florian Forster [Sun, 11 Jul 2010 12:25:07 +0000 (14:25 +0200)]
"list graphs" and "list hosts" actions: Add links to the "search" action.

9 years ago"search" action: If no search string is given, display an "advanced search" form.
Florian Forster [Fri, 9 Jul 2010 16:37:31 +0000 (18:37 +0200)]
"search" action: If no search string is given, display an "advanced search" form.

It's not advanced yet, but that will be coming soon.

9 years ago"list graphs" and "list hosts" actions: Add links to each other.
Florian Forster [Fri, 9 Jul 2010 13:01:20 +0000 (15:01 +0200)]
"list graphs" and "list hosts" actions: Add links to each other.

9 years ago"list hosts" action: Add action to list all hosts.
Florian Forster [Fri, 9 Jul 2010 12:56:14 +0000 (14:56 +0200)]
"list hosts" action: Add action to list all hosts.

9 years ago"show instance" action: Link to the "search" action in the breadcrump.
Florian Forster [Fri, 9 Jul 2010 12:39:31 +0000 (14:39 +0200)]
"show instance" action: Link to the "search" action in the breadcrump.

9 years agosrc/utils_cgi.c: Use the "search" action to … well … search.
Florian Forster [Fri, 9 Jul 2010 12:33:46 +0000 (14:33 +0200)]
src/utils_cgi.c: Use the "search" action to … well … search.

9 years ago"list graphs" action: Remove the functionality to actually search for graphs.
Florian Forster [Fri, 9 Jul 2010 12:26:27 +0000 (14:26 +0200)]
"list graphs" action: Remove the functionality to actually search for graphs.

9 years ago"search" action: Copied the "list_graphs" section to here.
Florian Forster [Fri, 9 Jul 2010 12:17:02 +0000 (14:17 +0200)]
"search" action: Copied the "list_graphs" section to here.

9 years ago"list graphs" action: Don't show graphs without instances.
Florian Forster [Thu, 8 Jul 2010 09:40:04 +0000 (11:40 +0200)]
"list graphs" action: Don't show graphs without instances.

9 years agoshare/collection.conf: Add "df_complex" graph for the "NetApp" plugin.
Florian Forster [Wed, 7 Jul 2010 16:02:36 +0000 (18:02 +0200)]
share/collection.conf: Add "df_complex" graph for the "NetApp" plugin.

9 years agosrc/graph.c: Compare instances with "inst_compare" not "ident_compare".
Florian Forster [Wed, 7 Jul 2010 15:24:31 +0000 (17:24 +0200)]
src/graph.c: Compare instances with "inst_compare" not "ident_compare".

D'oh!

9 years agosrc/graph_instance.[ch]: Implement "inst_compare".
Florian Forster [Wed, 7 Jul 2010 15:24:01 +0000 (17:24 +0200)]
src/graph_instance.[ch]: Implement "inst_compare".

9 years ago"show instance" action: Remove debugging message.
Florian Forster [Wed, 7 Jul 2010 14:52:53 +0000 (16:52 +0200)]
"show instance" action: Remove debugging message.

9 years agosrc/graph_list.c: Sort the instances of all graphs.
Florian Forster [Wed, 7 Jul 2010 14:16:29 +0000 (16:16 +0200)]
src/graph_list.c: Sort the instances of all graphs.

9 years agosrc/graph.c: Fix "graph_sort_instances".
Florian Forster [Wed, 7 Jul 2010 14:16:09 +0000 (16:16 +0200)]
src/graph.c: Fix "graph_sort_instances".

9 years agosrc/graph_list.c: Fix "gl_compare_hosts".
Florian Forster [Wed, 7 Jul 2010 14:12:54 +0000 (16:12 +0200)]
src/graph_list.c: Fix "gl_compare_hosts".

9 years agoshare/collection.conf: Add a couple new graphs.
Florian Forster [Wed, 7 Jul 2010 14:00:33 +0000 (16:00 +0200)]
share/collection.conf: Add a couple new graphs.

9 years agosrc/graph_list.c: Add dynamically generated graphs to an extra list.
Florian Forster [Wed, 7 Jul 2010 14:00:11 +0000 (16:00 +0200)]
src/graph_list.c: Add dynamically generated graphs to an extra list.

Profiling has shown that the majority of time is spent looking for a matching
graph in "gl_active" in the "gl_register_file" function. By adding dynamically
generated graphs (which will only ever match one file) to an extra list,
start-up time is decreased *a lot*.

9 years agosrc/graph_list.c: Increase update interval to 900 seconds.
Florian Forster [Wed, 7 Jul 2010 13:55:10 +0000 (15:55 +0200)]
src/graph_list.c: Increase update interval to 900 seconds.

9 years agosrc/graph.[ch]: Implement "graph_sort_instances".
Florian Forster [Wed, 7 Jul 2010 13:54:01 +0000 (15:54 +0200)]
src/graph.[ch]: Implement "graph_sort_instances".

9 years agoVarious: Remove argument validation after profiling.
Florian Forster [Wed, 7 Jul 2010 13:53:10 +0000 (15:53 +0200)]
Various: Remove argument validation after profiling.

9 years ago"show graph json" action: Return the correct MIME type.
Florian Forster [Tue, 6 Jul 2010 20:38:45 +0000 (22:38 +0200)]
"show graph json" action: Return the correct MIME type.

9 years ago"show graph json" action: Print "Expires" header.
Florian Forster [Tue, 6 Jul 2010 20:35:40 +0000 (22:35 +0200)]
"show graph json" action: Print "Expires" header.

9 years agosrc/graph_ident.c: ident_to_json: Escape strings before adding them to the buffer.
Florian Forster [Tue, 6 Jul 2010 20:24:54 +0000 (22:24 +0200)]
src/graph_ident.c: ident_to_json: Escape strings before adding them to the buffer.

9 years agosrc/utils_cgi.[ch]: Implement escape functions for JSON.
Florian Forster [Tue, 6 Jul 2010 20:20:08 +0000 (22:20 +0200)]
src/utils_cgi.[ch]: Implement escape functions for JSON.

9 years ago"show graph json" action: Implement action for exporting graph information as JSON.
Florian Forster [Tue, 6 Jul 2010 20:19:39 +0000 (22:19 +0200)]
"show graph json" action: Implement action for exporting graph information as JSON.

9 years ago"show graph" action: If the "q" parameter is given, only show matching instances.
Florian Forster [Tue, 6 Jul 2010 15:55:03 +0000 (17:55 +0200)]
"show graph" action: If the "q" parameter is given, only show matching instances.

9 years ago"list graphs" action: Pass the search term to the "show graph" action.
Florian Forster [Tue, 6 Jul 2010 15:19:06 +0000 (17:19 +0200)]
"list graphs" action: Pass the search term to the "show graph" action.

9 years agosrc/utils_cgi.c: Change shortcut name to "C₄" (from "c⁴").
Florian Forster [Tue, 6 Jul 2010 14:37:23 +0000 (16:37 +0200)]
src/utils_cgi.c: Change shortcut name to "C₄" (from "c⁴").

9 years ago"show instance" action: Use <h2 /> rather than <h3 /> for consistency.
Florian Forster [Tue, 6 Jul 2010 14:27:38 +0000 (16:27 +0200)]
"show instance" action: Use <h2 /> rather than <h3 /> for consistency.

9 years ago"show graph" action: Print a menu on the left side.
Florian Forster [Tue, 6 Jul 2010 14:27:09 +0000 (16:27 +0200)]
"show graph" action: Print a menu on the left side.

Currently only containing of "All graphs".

9 years ago"list graph" action: Don't show any instances if no search term is given.
Florian Forster [Tue, 6 Jul 2010 14:26:35 +0000 (16:26 +0200)]
"list graph" action: Don't show any instances if no search term is given.

9 years ago"show instance" action: Don't show a list of instances on the left side.
Florian Forster [Tue, 6 Jul 2010 14:24:58 +0000 (16:24 +0200)]
"show instance" action: Don't show a list of instances on the left side.

Rather show a link to the "show graph" action, titled "all instances".

9 years ago"list graphs" action: Link to the "show graph" action …
Florian Forster [Tue, 6 Jul 2010 09:11:24 +0000 (11:11 +0200)]
"list graphs" action: Link to the "show graph" action …

… if not all instances are shown.

9 years ago"show graph" action: Implement a page showing all instances of a graph.
Florian Forster [Tue, 6 Jul 2010 09:08:22 +0000 (11:08 +0200)]
"show graph" action: Implement a page showing all instances of a graph.

9 years agoshare/collection.conf: Improve the "df_inodes" graph.
Florian Forster [Tue, 6 Jul 2010 08:42:22 +0000 (10:42 +0200)]
share/collection.conf: Improve the "df_inodes" graph.

9 years agoshare/collection.conf: Improve configuration of the "swap" graph.
Florian Forster [Tue, 6 Jul 2010 08:35:49 +0000 (10:35 +0200)]
share/collection.conf: Improve configuration of the "swap" graph.

9 years ago"show instance" action: Parse the time parameters and pass them along to the "graph...
Florian Forster [Tue, 6 Jul 2010 07:44:00 +0000 (09:44 +0200)]
"show instance" action: Parse the time parameters and pass them along to the "graph" action.

9 years agosrc/common.[ch]: Implement "get_time_args".
Florian Forster [Tue, 6 Jul 2010 07:43:02 +0000 (09:43 +0200)]
src/common.[ch]: Implement "get_time_args".

9 years agosrc/common.c: Add missing folding markers.
Florian Forster [Tue, 6 Jul 2010 07:28:27 +0000 (09:28 +0200)]
src/common.c: Add missing folding markers.

9 years ago"graph" action: Print the "X-Generator" header on generated graphs, too.
Florian Forster [Tue, 6 Jul 2010 07:20:04 +0000 (09:20 +0200)]
"graph" action: Print the "X-Generator" header on generated graphs, too.

9 years agosrc/utils_cgi.c: Display the package name and version on generated pages.
Florian Forster [Tue, 6 Jul 2010 07:17:10 +0000 (09:17 +0200)]
src/utils_cgi.c: Display the package name and version on generated pages.

9 years agoshare/collection.conf: Add format option to disk_octets graph.
Florian Forster [Tue, 6 Jul 2010 07:06:24 +0000 (09:06 +0200)]
share/collection.conf: Add format option to disk_octets graph.

9 years agosrc/graph_list.c: Make "gl_add_graph_internal" static.
Florian Forster [Tue, 6 Jul 2010 07:06:05 +0000 (09:06 +0200)]
src/graph_list.c: Make "gl_add_graph_internal" static.

9 years agoAll files: Add LGPL 2.1 license header.
Florian Forster [Tue, 6 Jul 2010 06:55:49 +0000 (08:55 +0200)]
All files: Add LGPL 2.1 license header.