![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index cc0927e3376a354278abddbcfbd6e064c48c83a3..44e696cccf6549ec49707022d30c58a4f387da64 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
static sdb_type_t sdb_host_type;
static sdb_type_t sdb_service_type;
+static sdb_type_t sdb_metric_type;
static sdb_type_t sdb_attribute_type;
static int
sobj->services = sdb_avltree_create();
if (! sobj->services)
return -1;
+ sobj->metrics = sdb_avltree_create();
+ if (! sobj->metrics)
+ return -1;
sobj->attributes = sdb_avltree_create();
if (! sobj->attributes)
return -1;
if (sobj->services)
sdb_avltree_destroy(sobj->services);
+ if (sobj->metrics)
+ sdb_avltree_destroy(sobj->metrics);
if (sobj->attributes)
sdb_avltree_destroy(sobj->attributes);
} /* sdb_host_destroy */
sdb_avltree_destroy(sobj->attributes);
} /* sdb_service_destroy */
+static int
+sdb_metric_init(sdb_object_t *obj, va_list ap)
+{
+ sdb_metric_t *sobj = METRIC(obj);
+ int ret;
+
+ /* this will consume the first argument (type) of ap */
+ ret = store_obj_init(obj, ap);
+ if (ret)
+ return ret;
+
+ sobj->attributes = sdb_avltree_create();
+ if (! sobj->attributes)
+ return -1;
+ return 0;
+} /* sdb_metric_init */
+
+static void
+sdb_metric_destroy(sdb_object_t *obj)
+{
+ sdb_metric_t *sobj = METRIC(obj);
+ assert(obj);
+
+ store_obj_destroy(obj);
+
+ if (sobj->attributes)
+ sdb_avltree_destroy(sobj->attributes);
+} /* sdb_metric_destroy */
+
static int
sdb_attr_init(sdb_object_t *obj, va_list ap)
{
sdb_service_destroy
};
+static sdb_type_t sdb_metric_type = {
+ sizeof(sdb_metric_t),
+ sdb_metric_init,
+ sdb_metric_destroy
+};
+
static sdb_type_t sdb_attribute_type = {
sizeof(sdb_attribute_t),
sdb_attr_init,
if (old) {
if (old->last_update > last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
- "value too old (%"PRIscTIME" < %"PRIscTIME")",
+ "value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
SDB_STORE_TYPE_TO_NAME(type), name,
last_update, old->last_update);
/* don't report an error; the object may be updated by multiple
}
else {
sdb_type_t t;
- t = type == SDB_HOST ? sdb_host_type : sdb_service_type;
+ t = type == SDB_HOST
+ ? sdb_host_type
+ : type == SDB_SERVICE
+ ? sdb_service_type
+ : sdb_metric_type;
new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
}
sdb_host_t *host;
assert(hostname);
- assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+ assert((type == SDB_SERVICE) || (type == SDB_METRIC)
+ || (type == SDB_ATTRIBUTE));
if (! hosts)
return NULL;
sdb_object_deref(SDB_OBJ(host));
if (type == SDB_ATTRIBUTE)
return host->attributes;
+ else if (type == SDB_METRIC)
+ return host->metrics;
else
return host->services;
} /* get_host_children */
} /* store_common_tojson */
/*
- * store_obj_tojson serializes attribute / service objects to JSON.
+ * store_obj_tojson serializes attribute / metric / service objects to JSON.
*
* The function never returns an error. Rather, an error message will be part
* of the serialized data.
{
sdb_avltree_iter_t *iter;
- assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
+ assert((type == SDB_ATTRIBUTE)
+ || (type == SDB_METRIC)
+ || (type == SDB_SERVICE));
sdb_strbuf_append(buf, "[");
iter = sdb_avltree_get_iter(tree);
store_obj_tojson(SVC(sobj)->attributes, SDB_ATTRIBUTE,
buf, filter, flags);
}
+ else if ((sobj->type == SDB_METRIC)
+ && (! (flags & SDB_SKIP_ATTRIBUTES))) {
+ sdb_strbuf_append(buf, ", \"attributes\": ");
+ store_obj_tojson(METRIC(sobj)->attributes, SDB_ATTRIBUTE,
+ buf, filter, flags);
+ }
sdb_strbuf_append(buf, "}");
if (sdb_avltree_iter_has_next(iter))
return status;
} /* sdb_store_service_attr */
+int
+sdb_store_metric(const char *hostname, const char *name,
+ sdb_time_t last_update)
+{
+ sdb_avltree_t *metrics;
+
+ int status = 0;
+
+ if ((! hostname) || (! name))
+ return -1;
+
+ pthread_rwlock_wrlock(&host_lock);
+ metrics = get_host_children(hostname, SDB_METRIC);
+ if (! metrics) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
+ "host '%s' not found", name, hostname);
+ status = -1;
+ }
+
+ if (! status)
+ status = store_obj(metrics, SDB_METRIC, name, last_update, NULL);
+ pthread_rwlock_unlock(&host_lock);
+ return status;
+} /* sdb_store_metric */
+
+int
+sdb_store_metric_attr(const char *hostname, const char *metric,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update)
+{
+ sdb_avltree_t *metrics;
+ sdb_metric_t *m;
+ int status = 0;
+
+ if ((! hostname) || (! metric) || (! key))
+ return -1;
+
+ pthread_rwlock_wrlock(&host_lock);
+ metrics = get_host_children(hostname, SDB_METRIC);
+ if (! metrics) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
+ "for metric '%s' - host '%ss' not found",
+ key, metric, hostname);
+ pthread_rwlock_unlock(&host_lock);
+ return -1;
+ }
+
+ m = METRIC(sdb_avltree_lookup(metrics, metric));
+ if (! m) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+ "metric '%s/%s' not found", key, hostname, metric);
+ status = -1;
+ }
+
+ if (! status)
+ status = store_attr(m->attributes, key, value, last_update);
+
+ sdb_object_deref(SDB_OBJ(m));
+ pthread_rwlock_unlock(&host_lock);
+ return status;
+} /* sdb_store_metric_attr */
+
+int
+sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
+{
+ if ((! obj) || (! res))
+ return -1;
+
+ switch (field) {
+ case SDB_FIELD_LAST_UPDATE:
+ res->type = SDB_TYPE_DATETIME;
+ res->data.datetime = obj->last_update;
+ break;
+ case SDB_FIELD_AGE:
+ res->type = SDB_TYPE_DATETIME;
+ res->data.datetime = sdb_gettime() - obj->last_update;
+ break;
+ case SDB_FIELD_INTERVAL:
+ res->type = SDB_TYPE_DATETIME;
+ res->data.datetime = obj->interval;
+ break;
+ case SDB_FIELD_BACKEND:
+ /* TODO: add support for storing array values in a data object
+ * for now, fall thru to the error case */
+ default:
+ return -1;
+ }
+ return 0;
+} /* sdb_store_get_field */
+
int
sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
sdb_store_matcher_t *filter, int flags)
store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf, filter, flags);
}
+ if (! (flags & SDB_SKIP_METRICS)) {
+ sdb_strbuf_append(buf, ", \"metrics\": ");
+ store_obj_tojson(host->metrics, SDB_METRIC, buf, filter, flags);
+ }
+
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
store_obj_tojson(host->services, SDB_SERVICE, buf, filter, flags);