X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fplugin.c;h=83ef6ead9cb150aa447515ba60036691eedfd451;hp=235b8c7721ba97d08dc1b165c6ac0812ed7c6292;hb=b75718ea9fe4d6c90f1794e517a0712729553c0c;hpb=6f4b7e7407964b05477416d1c1c4291421a5859a

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 235b8c7..83ef6ea 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -406,8 +406,7 @@ plugin_writer_init(sdb_object_t *obj, va_list ap)
 	assert(impl);
 
 	if ((! impl->store_host) || (! impl->store_service)
-			|| (! impl->store_metric) || (! impl->store_attribute)
-			|| (! impl->store_service_attr) || (! impl->store_metric_attr)) {
+			|| (! impl->store_metric) || (! impl->store_attribute)) {
 		sdb_log(SDB_LOG_ERR, "core: store writer callback '%s' "
 				"does not fully implement the writer interface.",
 				obj->name);
@@ -662,6 +661,21 @@ plugin_add_callback(sdb_llist_t **list, const char *type,
 	return 0;
 } /* plugin_add_callback */
 
+static void
+get_backend(const char **backends, size_t *backends_num)
+{
+	const sdb_plugin_info_t *info;
+
+	info = sdb_plugin_current();
+	if ((! info) || (! info->plugin_name) || (! *info->plugin_name)) {
+		*backends_num = 0;
+		return;
+	}
+
+	backends[0] = info->plugin_name;
+	*backends_num = 1;
+} /* get_backend */
+
 /*
  * public API
  */
@@ -1470,6 +1484,8 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 int
 sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 {
+	sdb_store_host_t host = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1490,12 +1506,17 @@ sdb_plugin_store_host(const char *name, sdb_time_t last_update)
 		return -1;
 	}
 
+	host.name = cname;
+	host.last_update = last_update;
+	host.backends = backends;
+	get_backend(host.backends, &host.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_host(cname, last_update, writer->w_user_data);
+		s = writer->impl.store_host(&host, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}
@@ -1508,9 +1529,13 @@ int
 sdb_plugin_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
+	sdb_store_service_t service = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
+	sdb_data_t d;
+
 	int status = 0;
 
 	if ((! hostname) || (! name))
@@ -1528,17 +1553,32 @@ sdb_plugin_store_service(const char *hostname, const char *name,
 		return -1;
 	}
 
+	service.hostname = cname;
+	service.name = name;
+	service.last_update = last_update;
+	service.backends = backends;
+	get_backend(service.backends, &service.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_service(cname, name, last_update,
-				writer->w_user_data);
+		s = writer->impl.store_service(&service, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}
 	sdb_llist_iter_destroy(iter);
+
+	if (! status) {
+		/* record the hostname as an attribute */
+		d.type = SDB_TYPE_STRING;
+		d.data.string = cname;
+		if (sdb_plugin_store_service_attribute(cname, name,
+					"hostname", &d, last_update))
+			status = -1;
+	}
+
 	free(cname);
 	return status;
 } /* sdb_plugin_store_service */
@@ -1547,9 +1587,13 @@ int
 sdb_plugin_store_metric(const char *hostname, const char *name,
 		sdb_metric_store_t *store, sdb_time_t last_update)
 {
+	sdb_store_metric_t metric = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
+	sdb_data_t d;
+
 	int status = 0;
 
 	if ((! hostname) || (! name))
@@ -1570,17 +1614,36 @@ sdb_plugin_store_metric(const char *hostname, const char *name,
 	if (store && ((! store->type) || (! store->id)))
 		store = NULL;
 
+	metric.hostname = cname;
+	metric.name = name;
+	if (store) {
+		metric.store.type = store->type;
+		metric.store.id = store->id;
+	}
+	metric.last_update = last_update;
+	metric.backends = backends;
+	get_backend(metric.backends, &metric.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_metric(cname, name, store, last_update,
-				writer->w_user_data);
+		s = writer->impl.store_metric(&metric, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}
 	sdb_llist_iter_destroy(iter);
+
+	if (! status) {
+		/* record the hostname as an attribute */
+		d.type = SDB_TYPE_STRING;
+		d.data.string = cname;
+		if (sdb_plugin_store_metric_attribute(cname, name,
+					"hostname", &d, last_update))
+			status = -1;
+	}
+
 	free(cname);
 	return status;
 } /* sdb_plugin_store_metric */
@@ -1589,6 +1652,8 @@ int
 sdb_plugin_store_attribute(const char *hostname, const char *key,
 		const sdb_data_t *value, sdb_time_t last_update)
 {
+	sdb_store_attribute_t attr = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1609,13 +1674,20 @@ sdb_plugin_store_attribute(const char *hostname, const char *key,
 		return -1;
 	}
 
+	attr.parent_type = SDB_HOST;
+	attr.parent = cname;
+	attr.key = key;
+	attr.value = *value;
+	attr.last_update = last_update;
+	attr.backends = backends;
+	get_backend(attr.backends, &attr.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_attribute(cname, key, value, last_update,
-				writer->w_user_data);
+		s = writer->impl.store_attribute(&attr, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}
@@ -1628,6 +1700,8 @@ int
 sdb_plugin_store_service_attribute(const char *hostname, const char *service,
 		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
+	sdb_store_attribute_t attr = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1648,13 +1722,21 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
 		return -1;
 	}
 
+	attr.hostname = cname;
+	attr.parent_type = SDB_SERVICE;
+	attr.parent = service;
+	attr.key = key;
+	attr.value = *value;
+	attr.last_update = last_update;
+	attr.backends = backends;
+	get_backend(attr.backends, &attr.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_service_attr(cname, service,
-				key, value, last_update, writer->w_user_data);
+		s = writer->impl.store_attribute(&attr, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}
@@ -1667,6 +1749,8 @@ int
 sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
 		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
+	sdb_store_attribute_t attr = { 0 };
+	const char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1687,13 +1771,21 @@ sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
 		return -1;
 	}
 
+	attr.hostname = cname;
+	attr.parent_type = SDB_METRIC;
+	attr.parent = metric;
+	attr.key = key;
+	attr.value = *value;
+	attr.last_update = last_update;
+	attr.backends = backends;
+	get_backend(attr.backends, &attr.backends_num);
+
 	iter = sdb_llist_get_iter(writer_list);
 	while (sdb_llist_iter_has_next(iter)) {
 		writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
 		int s;
 		assert(writer);
-		s = writer->impl.store_metric_attr(cname, metric,
-				key, value, last_update, writer->w_user_data);
+		s = writer->impl.store_attribute(&attr, writer->w_user_data);
 		if (((s > 0) && (status >= 0)) || (s < 0))
 			status = s;
 	}