Merge pull request #10 from davidgs/master

Added v2 support

Author: tobiasschuerg

InfluxData.h

@@ -27,11 +27,13 @@ class InfluxData {
     _timestamp = " " + String(seconds) + "000000000";
   }
 
-  String toString() const { return _measurement + _tags + _values + _time; }
+  String toString() const { return _measurement + _tags + _values + _timestamp; }
 
  private:
   String _measurement;
   String _tags;
   String _values;
   String _timestamp;
+  String _bucket;
+  String _org;
 };

InfluxDb.cpp

@@ -20,6 +20,7 @@ Influxdb::Influxdb(String host, uint16_t port) {
 
 /**
  * Set the database to be used.
+ * @param db the Influx Database to be written to.
  */
 void Influxdb::setDb(String db) {
   _db = String(db);
@@ -36,12 +37,61 @@ void Influxdb::setDbAuth(String db, String user, String pass) {
   begin();
 }
 
+/**
+ * Set the Bucket to be used v2.0 ONLY.
+ * @param bucket the InfluxDB Bucket which must already exist
+ */
+void Influxdb::setBucket(String bucket) {
+  _bucket = String(bucket);
+  begin();
+}
+
+/**
+ * Set the influxDB port. 
+ * @param port v1.x uses 8086, v2 uses 9999
+ */
+void Influxdb::setPort(uint16 port){
+  _port = port;
+  begin();
+}
+/**
+ * Set the Organization to be used v2.0 ONLY
+ * @param org the Name of the organization unit to use which must already exist
+ */
+void Influxdb::setOrg(String org){
+  _org = String(org);
+  begin();
+}
+
+/**
+ * Set the authorization token v2.0 ONLY
+ * @param token the Auth Token from InfluxDBv2 *required*
+ */
+void Influxdb::setToken(String token){
+  _token = String(token);
+  begin();
+}
+
+/**
+ * Set the version of InfluxDB to write to
+ * @param version accepts 1 for version 1.x or 2 for version 2.x
+ */
+void Influxdb::setVersion(uint16_t version){
+  _db_v = version;
+  begin();
+}
+
 void Influxdb::begin() {
   // TODO: recreate HttpClient on db change?
-  if (_user && _pass) {
-    http.begin(_host, _port, "/write?u=" + _user + "&p=" + _pass + "&db=" + _db);
+  if(_db_v == 2){
+    http.begin(_host, _port, "/api/v2/write?org=" + _org + "&bucket=" + _bucket);
+    http.addHeader("Authorization", "Token " + _token);
   } else {
-    http.begin(_host, _port, "/write?db=" + _db);
+    if (_user && _pass) {
+      http.begin(_host, _port, "/write?u=" + _user + "&p=" + _pass + "&db=" + _db);
+    } else {
+      http.begin(_host, _port, "/write?db=" + _db);
+    }
   }
   http.addHeader("Content-Type", "text/plain");
 }
@@ -76,9 +126,17 @@ boolean Influxdb::write(InfluxData data) { return write(data.toString()); }
  * for a list of error codes.
  */
 boolean Influxdb::write(String data) {
-  Serial.print(" --> writing to " + _db + ":\n");
-  Serial.println(data);
-
+  if(_db_v == 2){
+    if(_token == NULL || _token.length() < 10){
+      Serial.println("#####\nInvalid Access Token\n#####");
+      return false;
+    }
+    Serial.print(" --> writing to host: " + _host + " Port: " + _port + " URL: /api/v2/write?org=" + _org + "&bucket=" + _bucket + ":\n");
+    Serial.println(data);
+  } else {
+    Serial.print(" --> writing to " + _db + ":\n");
+    Serial.println(data);
+  }
   int httpResponseCode = http.POST(data);
   Serial.print(" <-- Response: ");
   Serial.print(httpResponseCode);

InfluxDb.h

@@ -25,6 +25,12 @@ class Influxdb {
   void setDb(String db);
   void setDbAuth(String db, String user, String pass);
 
+  void setVersion(uint16_t version);
+  void setBucket(String bucket);
+  void setOrg(String org);
+  void setToken(String token);
+  void setPort(uint16_t port);
+
   void prepare(InfluxData data);
   boolean write();
 
@@ -38,6 +44,11 @@ class Influxdb {
   String _db;
   String _user;
   String _pass;
+  String _bucket;
+  String _org;
+  String _token;
+  uint16_t _db_v;
+
   std::list<InfluxData> prepared;
 
   void begin();

README.md

@@ -13,14 +13,21 @@ Library for NodeMcu / ESP8266 (and Arduino?) for sending measurements to an Infl
 
  // connect to WiFi
 
- Influxdb influx(INFLUXDB_HOST); // port defaults to 8086
+ Influxdb influx(INFLUXDB_HOST); // port defaults to 8086, use 9999 for v2
  // or to use a custom port
  Influxdb influx(INFLUXDB_HOST, INFLUXDB_PORT);
 
  // set the target database
  influx.setDb(INFLUXDB_DATABASE);
  // or use a db with auth
  influx.setDbAuth(INFLUXDB_DATABASE, INFLUXDB_USER, INFLUXDB_PASS) // with authentication
+
+// To use the v2.0 InfluxDB
+influx.setVersion(2);
+influx.setOrg("myOrganization");
+influx.setBucket("myBucket");
+influx.setToken("myToken");
+influx.setPort(9999);
 ```
 
 ## Sending a single measurement

example/Writing_Batched/Writing_Batched.ino

@@ -25,7 +25,11 @@ void setup() {
   Serial.println(WiFi.localIP());
 
   influx.setDb("test");
-
+// Uncomment the following lines to use the v2.0 InfluxDB
+// influx.setVersion(2);
+// influx.setOrg("myOrganization");
+// influx.setBucket("myBucket");
+// influx.setToken("myToken");
   Serial.println("Setup done");
 }
 

example/Writing_Single/Writing_Single.ino

@@ -25,7 +25,11 @@ void setup() {
   Serial.println(WiFi.localIP());
 
   influx.setDb("test");
-
+// Uncomment the following lines to use the v2.0 InfluxDB
+// influx.setVersion(2);
+// influx.setOrg("myOrganization");
+// influx.setBucket("myBucket");
+// influx.setToken("myToken");
   Serial.println("Setup done");
 }