rename InfluxDBv2 parameter Database to Bucket (#2704)

* rename InfluxDBv2 parameter Database to Basket

* only enable the field if it is a boolean

* corrected "Basket" to "Bucket"

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.cpp

@@ -20,7 +20,7 @@ static const char* TAG = "INFLUXDBV2";
 void ClassFlowInfluxDBv2::SetInitialParameter(void)
 {
     uri = "";
-    database = "";
+    bucket = "";
     dborg = "";  
     dbtoken = "";  
 //    dbfield = "";
@@ -109,9 +109,9 @@ bool ClassFlowInfluxDBv2::ReadParameter(FILE* pfile, string& aktparamgraph)
         {
             handleMeasurement(splitted[0], splitted[1]);
         }
-        if (((toUpper(splitted[0]) == "DATABASE")) && (splitted.size() > 1))
+        if (((toUpper(splitted[0]) == "BUCKET")) && (splitted.size() > 1))
         {
-            this->database = splitted[1];
+            this->bucket = splitted[1];
         }
     }
 
@@ -119,11 +119,11 @@ bool ClassFlowInfluxDBv2::ReadParameter(FILE* pfile, string& aktparamgraph)
     printf("org:         %s\n", dborg.c_str());
     printf("token:       %s\n", dbtoken.c_str());
 
-    if ((uri.length() > 0) && (database.length() > 0) && (dbtoken.length() > 0) && (dborg.length() > 0)) 
+    if ((uri.length() > 0) && (bucket.length() > 0) && (dbtoken.length() > 0) && (dborg.length() > 0)) 
     { 
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init InfluxDB with uri: " + uri + ", org: " + dborg + ", token: *****");
 //        printf("vor V2 Init\n");
-        InfluxDB_V2_Init(uri, database, dborg, dbtoken); 
+        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken); 
 //        printf("nach V2 Init\n");
         InfluxDBenable = true;
     } else {

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.h

@@ -15,7 +15,7 @@ class ClassFlowInfluxDBv2 :
     public ClassFlow
 {
 protected:
-    std::string uri, database;
+    std::string uri, bucket;
     std::string dborg, dbtoken, dbfield;
     std::string OldValue;
 	ClassFlowPostProcessing* flowpostprocessing;  

code/components/jomjol_influxdb/interface_influxdb.cpp

@@ -16,16 +16,16 @@ std::string _influxDBUser;
 std::string _influxDBPassword;
 
 std::string _influxDB_V2_URI;
-std::string _influxDB_V2_Database;
+std::string _influxDB_V2_Bucket;
 std::string _influxDB_V2_Token;
 std::string _influxDB_V2_Org;
 
 static esp_err_t http_event_handler(esp_http_client_event_t *evt);
 
-void InfluxDB_V2_Init(std::string _uri, std::string _database, std::string _org, std::string _token)
+void InfluxDB_V2_Init(std::string _uri, std::string _bucket, std::string _org, std::string _token)
 {
     _influxDB_V2_URI = _uri;
-    _influxDB_V2_Database = _database;
+    _influxDB_V2_Bucket = _bucket;
     _influxDB_V2_Org = _org;
     _influxDB_V2_Token = _token;
 }
@@ -70,7 +70,7 @@ void InfluxDB_V2_Publish(std::string _measurement, std::string _key, std::string
 
     LogFile.WriteToFile(ESP_LOG_INFO, TAG, "sending line to influxdb:" + payload);
 
-    std::string apiURI = _influxDB_V2_URI + "/api/v2/write?org=" + _influxDB_V2_Org + "&bucket=" + _influxDB_V2_Database;
+    std::string apiURI = _influxDB_V2_URI + "/api/v2/write?org=" + _influxDB_V2_Org + "&bucket=" + _influxDB_V2_Bucket;
     apiURI.shrink_to_fit();
     http_config.url = apiURI.c_str();
     ESP_LOGI(TAG, "http_config: %s", http_config.url); // Add mark on log to see when it restarted
@@ -183,7 +183,7 @@ void InfluxDBPublish(std::string _measurement, std::string _key, std::string _co
     LogFile.WriteToFile(ESP_LOG_INFO, TAG, "sending line to influxdb:" + payload);
 
 
-    // use the default retention policy of the database
+    // use the default retention policy of the bucket
     std::string apiURI = _influxDBURI + "/write?db=" + _influxDBDatabase;
 //    std::string apiURI = _influxDBURI + "/api/v2/write?bucket=" + _influxDBDatabase + "/";
 

code/components/jomjol_influxdb/interface_influxdb.h

@@ -13,7 +13,7 @@ void InfluxDBInit(std::string _influxDBURI, std::string _database, std::string _
 void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, std::string _timestamp);
 
 // Interface to InfluxDB v2.x
-void InfluxDB_V2_Init(std::string _uri, std::string _database, std::string _org, std::string _token);
+void InfluxDB_V2_Init(std::string _uri, std::string _bucket, std::string _org, std::string _token);
 void InfluxDB_V2_Publish(std::string _measurement, std::string _key, std::string _content, std::string _timestamp);
 
 

code/main/main.cpp

@@ -642,7 +642,6 @@ void migrateConfiguration(void) {
             /* Fieldname has a <NUMBER> as prefix! */
             if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
                 migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
-                migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
             }
         }
 
@@ -650,7 +649,10 @@ void migrateConfiguration(void) {
             /* Fieldname has a <NUMBER> as prefix! */
             if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
                 migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
-                migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
+            }
+            /* Database got renamed to Bucket! */
+            if (isInString(configLines[i], "Database")) { // It is the parameter "Database"
+                migrated = migrated | replaceString(configLines[i], "Database", "Bucket"); // Rename it to Bucket
             }
         }
 
@@ -814,4 +816,4 @@ bool setCpuFrequency(void) {
     }
 
     return true;
-}
+}

sd-card/config/config.ini

@@ -75,7 +75,7 @@ HomeassistantDiscovery = false
 
 ;[InfluxDBv2]
 ;Uri = undefined
-;Database = undefined
+;Bucket = undefined
 ;Measurement = undefined
 ;Org = undefined
 ;Token = undefined

sd-card/html/edit_config_param.html

@@ -952,13 +952,13 @@
 
         <tr class="InfluxDBv2Item">
 			<td class="indent1">
-				<input type="checkbox" id="InfluxDBv2_Database_enabled" value="1"  onclick = 'InvertEnableItem("InfluxDBv2", "Database")' unchecked >
-				<label for=InfluxDBv2_Database_enabled><class id="InfluxDBv2_Database_text" style="color:black;">Database</class></label>
+				<input type="checkbox" id="InfluxDBv2_Bucket_enabled" value="1"  onclick = 'InvertEnableItem("InfluxDBv2", "Bucket")' unchecked >
+				<label for=InfluxDBv2_Bucket_enabled><class id="InfluxDBv2_Bucket_text" style="color:black;">Bucket</class></label>
 			</td>
 			<td>
-				<input required type="text" id="InfluxDBv2_Database_value1">
+				<input required type="text" id="InfluxDBv2_Bucket_value1">
 			</td>
-			<td>$TOOLTIP_InfluxDBv2_Database</td>
+			<td>$TOOLTIP_InfluxDBv2_Bucket</td>
 		</tr>
 
 		<tr class="InfluxDBv2Item">
@@ -2134,7 +2134,7 @@ function UpdateInput() {
 //	WriteParameter(param, category, "InfluxDB", "Field", true);
 
     WriteParameter(param, category, "InfluxDBv2", "Uri", true);	
-    WriteParameter(param, category, "InfluxDBv2", "Database", true);	
+    WriteParameter(param, category, "InfluxDBv2", "Bucket", true);	
 //	WriteParameter(param, category, "InfluxDBv2", "Measurement", true);	
     WriteParameter(param, category, "InfluxDBv2", "Org", true);	
     WriteParameter(param, category, "InfluxDBv2", "Token", true);	
@@ -2272,7 +2272,7 @@ function ReadParameterAll()
     ReadParameter(param, "InfluxDB", "password", true);
 
     ReadParameter(param, "InfluxDBv2", "Uri", true);
-    ReadParameter(param, "InfluxDBv2", "Database", true);
+    ReadParameter(param, "InfluxDBv2", "Bucket", true);
     ReadParameter(param, "InfluxDBv2", "Measurement", true);
     ReadParameter(param, "InfluxDBv2", "Org", true);
     ReadParameter(param, "InfluxDBv2", "Token", true);

sd-card/html/readconfigparam.js

@@ -206,7 +206,7 @@ function ParseConfig() {
      category[catname]["found"] = false;
      param[catname] = new Object();
      ParamAddValue(param, catname, "Uri");
-     ParamAddValue(param, catname, "Database");
+     ParamAddValue(param, catname, "Bucket");
 //     ParamAddValue(param, catname, "Measurement");
      ParamAddValue(param, catname, "Org");
      ParamAddValue(param, catname, "Token");