X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fplugin.c;h=3611be4966b51d296557620e9ed77abda9d7ce48;hp=6b1560336b311a659c35566333d78a147d8d39c2;hb=9a96acd759c31211aa512e174339a9c178c4eb83;hpb=502bbcd0731ca35b4f3d93653a818f5246f81e0b

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 6b15603..3611be4 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(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
  */
@@ -1423,7 +1437,8 @@ sdb_plugin_fetch_timeseries(const char *type, const char *id,
 } /* sdb_plugin_fetch_timeseries */
 
 int
-sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+sdb_plugin_query(sdb_ast_node_t *ast,
+		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
 {
 	size_t n = sdb_llist_len(reader_list);
 	reader_t *reader;
@@ -1433,6 +1448,16 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 	if (! ast)
 		return 0;
 
+	if ((ast->type != SDB_AST_TYPE_FETCH)
+			&& (ast->type != SDB_AST_TYPE_LIST)
+			&& (ast->type != SDB_AST_TYPE_LOOKUP)) {
+		sdb_log(SDB_LOG_ERR, "core: Cannot execute query of type %s",
+				SDB_AST_TYPE_TO_STRING(ast));
+		sdb_strbuf_sprintf(errbuf, "Cannot execute query of type %s",
+				SDB_AST_TYPE_TO_STRING(ast));
+		return -1;
+	}
+
 	if (n != 1) {
 		char *msg = (n > 0)
 			? "Cannot execute query: multiple readers not supported"
@@ -1447,7 +1472,8 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 
 	q = reader->impl.prepare_query(ast, errbuf, reader->r_user_data);
 	if (q)
-		status = reader->impl.execute_query(q, buf, errbuf, reader->r_user_data);
+		status = reader->impl.execute_query(q, w, SDB_OBJ(wd),
+				errbuf, reader->r_user_data);
 	else
 		status = -1;
 
@@ -1459,6 +1485,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 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1479,12 +1507,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 = (const char * const *)backends;
+	get_backend(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;
 	}
@@ -1497,9 +1530,13 @@ int
 sdb_plugin_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
+	sdb_store_service_t service = { 0 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
+	sdb_data_t d;
+
 	int status = 0;
 
 	if ((! hostname) || (! name))
@@ -1517,17 +1554,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 = (const char * const *)backends;
+	get_backend(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 */
@@ -1536,9 +1588,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 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
+	sdb_data_t d;
+
 	int status = 0;
 
 	if ((! hostname) || (! name))
@@ -1559,17 +1615,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 = (const char * const *)backends;
+	get_backend(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 */
@@ -1578,6 +1653,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 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1598,13 +1675,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 = (const char * const *)backends;
+	get_backend(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;
 	}
@@ -1617,6 +1701,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 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1637,13 +1723,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 = (const char * const *)backends;
+	get_backend(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;
 	}
@@ -1656,6 +1750,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 };
+	char *backends[1];
 	char *cname;
 
 	sdb_llist_iter_t *iter;
@@ -1676,13 +1772,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 = (const char * const *)backends;
+	get_backend(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;
 	}