Collectd browser for system statistics graphs

@@ -137,9 +137,18 @@ var graph_url = ''; + + + + + + + + + +

- - -
Graph list favorites:

diff --git a/src/postgresql_default.conf b/src/postgresql_default.conf index d289ded5..83a32c77 100644 --- a/src/postgresql_default.conf +++ b/src/postgresql_default.conf @@ -141,14 +141,14 @@ - Statement "SELECT sum(heap_blks_read) AS heap_read, \ - sum(heap_blks_hit) AS heap_hit, \ - sum(idx_blks_read) AS idx_read, \ - sum(idx_blks_hit) AS idx_hit, \ - sum(toast_blks_read) AS toast_read, \ - sum(toast_blks_hit) AS toast_hit, \ - sum(tidx_blks_read) AS tidx_read, \ - sum(tidx_blks_hit) AS tidx_hit \ + Statement "SELECT coalesce(sum(heap_blks_read), 0) AS heap_read, \ + coalesce(sum(heap_blks_hit), 0) AS heap_hit, \ + coalesce(sum(idx_blks_read), 0) AS idx_read, \ + coalesce(sum(idx_blks_hit), 0) AS idx_hit, \ + coalesce(sum(toast_blks_read), 0) AS toast_read, \ + coalesce(sum(toast_blks_hit), 0) AS toast_hit, \ + coalesce(sum(tidx_blks_read), 0) AS tidx_read, \ + coalesce(sum(tidx_blks_hit), 0) AS tidx_hit \ FROM pg_statio_user_tables;" diff --git a/src/rrdtool.c b/src/rrdtool.c index debb7bd4..b80e1109 100644 --- a/src/rrdtool.c +++ b/src/rrdtool.c @@ -279,6 +279,7 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data) rrd_cache_t *cache_entry; char **values; int values_num; + int status; int i; pthread_mutex_lock (&queue_lock); @@ -286,7 +287,6 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data) while (true) { struct timespec ts_wait; - int status; while ((flushq_head == NULL) && (queue_head == NULL) && (do_shutdown == 0)) @@ -361,17 +361,28 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data) * we make a copy of it's values */ pthread_mutex_lock (&cache_lock); - c_avl_get (cache, queue_entry->filename, (void *) &cache_entry); + status = c_avl_get (cache, queue_entry->filename, + (void *) &cache_entry); - values = cache_entry->values; - values_num = cache_entry->values_num; + if (status == 0) + { + values = cache_entry->values; + values_num = cache_entry->values_num; - cache_entry->values = NULL; - cache_entry->values_num = 0; - cache_entry->flags = FLAG_NONE; + cache_entry->values = NULL; + cache_entry->values_num = 0; + cache_entry->flags = FLAG_NONE; + } pthread_mutex_unlock (&cache_lock); + if (status != 0) + { + sfree (queue_entry->filename); + sfree (queue_entry); + continue; + } + /* Update `tv_next_update' */ if (write_rate > 0.0) { @@ -625,6 +636,15 @@ static int rrd_cache_insert (const char *filename, pthread_mutex_lock (&cache_lock); + /* This shouldn't happen, but it did happen at least once, so we'll be + * careful. */ + if (cache == NULL) + { + pthread_mutex_unlock (&cache_lock); + WARNING ("rrdtool plugin: cache == NULL."); + return (-1); + } + c_avl_get (cache, filename, (void *) &rc); if (rc == NULL) diff --git a/src/snmp.c b/src/snmp.c index 998c4b64..352075f2 100644 --- a/src/snmp.c +++ b/src/snmp.c @@ -696,6 +696,7 @@ static void csnmp_host_open_session (host_definition_t *host) } } /* void csnmp_host_open_session */ +/* TODO: Check if negative values wrap around. Problem: negative temperatures. */ static value_t csnmp_value_list_to_value (struct variable_list *vl, int type, double scale, double shift) { diff --git a/src/utils_avltree.c b/src/utils_avltree.c index 9f0b7968..3e258e95 100644 --- a/src/utils_avltree.c +++ b/src/utils_avltree.c @@ -581,6 +581,8 @@ int c_avl_get (c_avl_tree_t *t, const void *key, void **value) { c_avl_node_t *n; + assert (t != NULL); + n = search (t, key); if (n == NULL) return (-1);