X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=proto%2Ftypes.proto;h=fde3afaf76acda63dc77f03b1c28f8d86219ad45;hp=7f3d329d4f63404d3c28cd0a0043a82253006708;hb=da11ce02eb202b3e01d3e2d1b40f248a84430973;hpb=408b3fc30cabf109333b2b86caf5edf47f5b82f5

diff --git a/proto/types.proto b/proto/types.proto
index 7f3d329d..fde3afaf 100644
--- a/proto/types.proto
+++ b/proto/types.proto
@@ -1,5 +1,5 @@
 // collectd - proto/types.proto
-// Copyright (C) 2015 Sebastian Harl
+// Copyright (C) 2015-2016 Sebastian Harl
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -25,28 +25,46 @@
 syntax = "proto3";
 
 package collectd.types;
+option go_package = "collectd.org/rpc/proto/types";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
+message Identifier {
+  string host = 1;
+  string plugin = 2;
+  string plugin_instance = 3;
+  string type = 4;
+  string type_instance = 5;
+}
+
+message MetadataValue {
+  oneof value {
+    string string_value = 1;
+    int64 int64_value = 2;
+    uint64 uint64_value = 3;
+    double double_value = 4;
+    bool bool_value = 5;
+  };
+}
+
 message Value {
-	oneof value {
-		uint64 counter = 1;
-		double gauge = 2;
-		int64 derive = 3;
-		uint64 absolute = 4;
-	};
+  oneof value {
+    uint64 counter = 1;
+    double gauge = 2;
+    int64 derive = 3;
+    uint64 absolute = 4;
+  };
 }
 
 message ValueList {
-	repeated Value value = 1;
+  repeated Value values = 1;
 
-	google.protobuf.Timestamp time = 2;
-	google.protobuf.Duration interval = 3;
+  google.protobuf.Timestamp time = 2;
+  google.protobuf.Duration interval = 3;
 
-	string host = 4;
-	string plugin = 5;
-	string plugin_instance = 6;
-	string type = 7;
-	string type_instance = 8;
-}
+  Identifier identifier = 4;
+
+  repeated string ds_names = 5;
+  map<string, MetadataValue> meta_data = 6;
+}
\ No newline at end of file