-
Notifications
You must be signed in to change notification settings - Fork 652
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Implement InfluxDBv2 Innitial * Update incl. UI * Correct UI * Update UI - Indiv. Param. * Update edit_config_param.html * Correct Timeshift * Update Fieldname
- Loading branch information
Showing
13 changed files
with
578 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
219 changes: 219 additions & 0 deletions
219
code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,219 @@ | ||
#ifdef ENABLE_INFLUXDB | ||
#include <sstream> | ||
#include "ClassFlowInfluxDBv2.h" | ||
#include "Helper.h" | ||
#include "connect_wlan.h" | ||
|
||
#include "time_sntp.h" | ||
#include "interface_influxdb.h" | ||
|
||
#include "ClassFlowPostProcessing.h" | ||
#include "esp_log.h" | ||
#include "../../include/defines.h" | ||
|
||
#include "ClassLogFile.h" | ||
|
||
#include <time.h> | ||
|
||
static const char* TAG = "class_flow_influxDbv2"; | ||
|
||
void ClassFlowInfluxDBv2::SetInitialParameter(void) | ||
{ | ||
uri = ""; | ||
database = ""; | ||
measurement = ""; | ||
dborg = ""; | ||
dbtoken = ""; | ||
// dbfield = ""; | ||
|
||
OldValue = ""; | ||
flowpostprocessing = NULL; | ||
previousElement = NULL; | ||
ListFlowControll = NULL; | ||
disabled = false; | ||
InfluxDBenable = false; | ||
} | ||
|
||
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2() | ||
{ | ||
SetInitialParameter(); | ||
} | ||
|
||
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2(std::vector<ClassFlow*>* lfc) | ||
{ | ||
SetInitialParameter(); | ||
|
||
ListFlowControll = lfc; | ||
for (int i = 0; i < ListFlowControll->size(); ++i) | ||
{ | ||
if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0) | ||
{ | ||
flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i]; | ||
} | ||
} | ||
} | ||
|
||
ClassFlowInfluxDBv2::ClassFlowInfluxDBv2(std::vector<ClassFlow*>* lfc, ClassFlow *_prev) | ||
{ | ||
SetInitialParameter(); | ||
|
||
previousElement = _prev; | ||
ListFlowControll = lfc; | ||
|
||
for (int i = 0; i < ListFlowControll->size(); ++i) | ||
{ | ||
if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0) | ||
{ | ||
flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i]; | ||
} | ||
} | ||
} | ||
|
||
|
||
bool ClassFlowInfluxDBv2::ReadParameter(FILE* pfile, string& aktparamgraph) | ||
{ | ||
std::vector<string> splitted; | ||
|
||
aktparamgraph = trim(aktparamgraph); | ||
printf("akt param: %s\n", aktparamgraph.c_str()); | ||
|
||
if (aktparamgraph.size() == 0) | ||
if (!this->GetNextParagraph(pfile, aktparamgraph)) | ||
return false; | ||
|
||
if (toUpper(aktparamgraph).compare("[INFLUXDBV2]") != 0) | ||
return false; | ||
|
||
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) | ||
{ | ||
// ESP_LOGD(TAG, "while loop reading line: %s", aktparamgraph.c_str()); | ||
splitted = ZerlegeZeile(aktparamgraph); | ||
std::string _param = GetParameterName(splitted[0]); | ||
|
||
if ((toUpper(_param) == "ORG") && (splitted.size() > 1)) | ||
{ | ||
this->dborg = splitted[1]; | ||
} | ||
if ((toUpper(_param) == "TOKEN") && (splitted.size() > 1)) | ||
{ | ||
this->dbtoken = splitted[1]; | ||
} | ||
if ((toUpper(_param) == "URI") && (splitted.size() > 1)) | ||
{ | ||
this->uri = splitted[1]; | ||
} | ||
if (((toUpper(_param) == "MEASUREMENT")) && (splitted.size() > 1)) | ||
{ | ||
this->measurement = splitted[1]; | ||
} | ||
if (((toUpper(_param) == "FIELDNAME")) && (splitted.size() > 1)) | ||
{ | ||
handleFieldname(splitted[0], splitted[1]); | ||
} | ||
if (((toUpper(splitted[0]) == "DATABASE")) && (splitted.size() > 1)) | ||
{ | ||
this->database = splitted[1]; | ||
} | ||
} | ||
|
||
printf("uri: %s\n", uri.c_str()); | ||
printf("measurement: %s\n", measurement.c_str()); | ||
printf("org: %s\n", dborg.c_str()); | ||
printf("token: %s\n", dbtoken.c_str()); | ||
|
||
if ((uri.length() > 0) && (database.length() > 0) && (measurement.length() > 0) && (dbtoken.length() > 0) && (dborg.length() > 0)) | ||
{ | ||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init InfluxDB with uri: " + uri + ", measurement: " + measurement + ", org: " + dborg + ", token: *****"); | ||
// printf("vor V2 Init\n"); | ||
InfluxDB_V2_Init(uri, database, measurement, dborg, dbtoken); | ||
// printf("nach V2 Init\n"); | ||
InfluxDBenable = true; | ||
} else { | ||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDBv2 (Verion2 !!!) init skipped as we are missing some parameters"); | ||
} | ||
|
||
return true; | ||
} | ||
|
||
|
||
string ClassFlowInfluxDBv2::GetInfluxDBMeasurement() | ||
{ | ||
return measurement; | ||
} | ||
|
||
void ClassFlowInfluxDBv2::handleFieldname(string _decsep, string _value) | ||
{ | ||
string _digit, _decpos; | ||
int _pospunkt = _decsep.find_first_of("."); | ||
// ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt); | ||
if (_pospunkt > -1) | ||
_digit = _decsep.substr(0, _pospunkt); | ||
else | ||
_digit = "default"; | ||
for (int j = 0; j < flowpostprocessing->NUMBERS.size(); ++j) | ||
{ | ||
if (_digit == "default") // Set to default first (if nothing else is set) | ||
{ | ||
flowpostprocessing->NUMBERS[j]->Fieldname = _value; | ||
} | ||
if (flowpostprocessing->NUMBERS[j]->name == _digit) | ||
{ | ||
flowpostprocessing->NUMBERS[j]->Fieldname = _value; | ||
} | ||
} | ||
} | ||
|
||
|
||
|
||
bool ClassFlowInfluxDBv2::doFlow(string zwtime) | ||
{ | ||
if (!InfluxDBenable) | ||
return true; | ||
|
||
std::string result; | ||
std::string resulterror = ""; | ||
std::string resultraw = ""; | ||
std::string resultrate = ""; | ||
std::string resulttimestamp = ""; | ||
string zw = ""; | ||
string namenumber = ""; | ||
|
||
if (flowpostprocessing) | ||
{ | ||
std::vector<NumberPost*>* NUMBERS = flowpostprocessing->GetNumbers(); | ||
|
||
for (int i = 0; i < (*NUMBERS).size(); ++i) | ||
{ | ||
result = (*NUMBERS)[i]->ReturnValue; | ||
resultraw = (*NUMBERS)[i]->ReturnRawValue; | ||
resulterror = (*NUMBERS)[i]->ErrorMessageText; | ||
resultrate = (*NUMBERS)[i]->ReturnRateValue; | ||
resulttimestamp = (*NUMBERS)[i]->timeStamp; | ||
|
||
if ((*NUMBERS)[i]->Fieldname.length() > 0) | ||
{ | ||
namenumber = (*NUMBERS)[i]->Fieldname; | ||
} | ||
else | ||
{ | ||
namenumber = (*NUMBERS)[i]->name; | ||
if (namenumber == "default") | ||
namenumber = "value"; | ||
else | ||
namenumber = namenumber + "/value"; | ||
} | ||
|
||
printf("vor sende Influx_DB_V2 - namenumber. %s, result: %s, timestampt: %s", namenumber.c_str(), result.c_str(), resulttimestamp.c_str()); | ||
|
||
if (result.length() > 0) | ||
InfluxDB_V2_Publish(namenumber, result, resulttimestamp); | ||
// InfluxDB_V2_Publish(namenumber, result, resulttimestamp); | ||
} | ||
} | ||
|
||
OldValue = result; | ||
|
||
return true; | ||
} | ||
|
||
#endif //ENABLE_INFLUXDB |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
#ifdef ENABLE_INFLUXDB | ||
|
||
#pragma once | ||
|
||
#ifndef CLASSFINFLUXDBv2_H | ||
#define CLASSFINFLUXDBv2_H | ||
|
||
#include "ClassFlow.h" | ||
|
||
#include "ClassFlowPostProcessing.h" | ||
|
||
#include <string> | ||
|
||
class ClassFlowInfluxDBv2 : | ||
public ClassFlow | ||
{ | ||
protected: | ||
std::string uri, database, measurement; | ||
std::string dborg, dbtoken, dbfield; | ||
std::string OldValue; | ||
ClassFlowPostProcessing* flowpostprocessing; | ||
bool InfluxDBenable; | ||
|
||
void SetInitialParameter(void); | ||
|
||
void handleFieldname(string _decsep, string _value); | ||
|
||
public: | ||
ClassFlowInfluxDBv2(); | ||
ClassFlowInfluxDBv2(std::vector<ClassFlow*>* lfc); | ||
ClassFlowInfluxDBv2(std::vector<ClassFlow*>* lfc, ClassFlow *_prev); | ||
|
||
string GetInfluxDBMeasurement(); | ||
|
||
bool ReadParameter(FILE* pfile, string& aktparamgraph); | ||
bool doFlow(string time); | ||
string name(){return "ClassFlowInfluxDBv2";}; | ||
}; | ||
|
||
#endif //CLASSFINFLUXDBv2_H | ||
#endif //ENABLE_INFLUXDB |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.