Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-06 11:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename InfluxDBv2 parameter Database to Bucket (#2704)

Browse Source 
* 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>
This commit is contained in:
CaCO3
2023-11-22 23:43:23 +01:00
committed by GitHub
parent 1094c8a0a8
commit 02138c44ac
8 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.cpp
View File

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

2
code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.h
View File

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

10
code/components/jomjol_influxdb/interface_influxdb.cpp
View File

@@ -16,16 +16,16 @@ std::string _influxDBUser;
std::string _influxDBPassword; std::string _influxDBPassword;
std::string _influxDB_V2_URI; std::string _influxDB_V2_URI;
std::string _influxDB_V2_Database; std::string _influxDB_V2_Bucket;
std::string _influxDB_V2_Token; std::string _influxDB_V2_Token;
std::string _influxDB_V2_Org; std::string _influxDB_V2_Org;
static esp_err_t http_event_handler(esp_http_client_event_t *evt); 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_URI = _uri;
_influxDB_V2_Database = _database; _influxDB_V2_Bucket = _bucket;
_influxDB_V2_Org = _org; _influxDB_V2_Org = _org;
_influxDB_V2_Token = _token; _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); 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(); apiURI.shrink_to_fit();
http_config.url = apiURI.c_str(); http_config.url = apiURI.c_str();
ESP_LOGI(TAG, "http_config: %s", http_config.url); // Add mark on log to see when it restarted 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); 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 + "/write?db=" + _influxDBDatabase;
// std::string apiURI = _influxDBURI + "/api/v2/write?bucket=" + _influxDBDatabase + "/"; // std::string apiURI = _influxDBURI + "/api/v2/write?bucket=" + _influxDBDatabase + "/";

2
code/components/jomjol_influxdb/interface_influxdb.h
View File

@@ -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); void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, std::string _timestamp);
// Interface to InfluxDB v2.x // 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); void InfluxDB_V2_Publish(std::string _measurement, std::string _key, std::string _content, std::string _timestamp);

6
code/main/main.cpp
View File

@@ -642,7 +642,6 @@ void migrateConfiguration(void) {
/* Fieldname has a <NUMBER> as prefix! */ /* Fieldname has a <NUMBER> as prefix! */
if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname" 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], "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! */ /* Fieldname has a <NUMBER> as prefix! */
if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname" 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], "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
} }
} }

2
sd-card/config/config.ini
View File

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

12
sd-card/html/edit_config_param.html
View File

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

2
sd-card/html/readconfigparam.js
View File

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