mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 20:16:55 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com>
116 lines
3.8 KiB
C++
116 lines
3.8 KiB
C++
#ifdef ENABLE_INFLUXDB
|
|
#include "interface_influxdb.h"
|
|
|
|
//#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
|
|
#include "esp_log.h"
|
|
#include <time.h>
|
|
#include "ClassLogFile.h"
|
|
#include "esp_http_client.h"
|
|
|
|
#define MAX_HTTP_OUTPUT_BUFFER 2048
|
|
|
|
static const char *TAG = "INFLUXDB";
|
|
|
|
std::string _influxDBURI;
|
|
std::string _influxDBDatabase;
|
|
std::string _influxDBMeasurement;
|
|
std::string _influxDBUser;
|
|
std::string _influxDBPassword;
|
|
|
|
static esp_err_t http_event_handler(esp_http_client_event_t *evt)
|
|
{
|
|
switch(evt->event_id)
|
|
{
|
|
case HTTP_EVENT_ERROR:
|
|
ESP_LOGE(TAG, "HTTP Client Error encountered");
|
|
break;
|
|
case HTTP_EVENT_ON_CONNECTED:
|
|
ESP_LOGI(TAG, "HTTP Client Connected");
|
|
break;
|
|
case HTTP_EVENT_HEADERS_SENT:
|
|
ESP_LOGV(TAG, "HTTP Client sent all request headers");
|
|
break;
|
|
case HTTP_EVENT_ON_HEADER:
|
|
ESP_LOGV(TAG, "Header: key=%s, value=%s", evt->header_key, evt->header_value);
|
|
break;
|
|
case HTTP_EVENT_ON_DATA:
|
|
ESP_LOGV(TAG, "HTTP Client data recevied: len=%d", evt->data_len);
|
|
break;
|
|
case HTTP_EVENT_ON_FINISH:
|
|
ESP_LOGI(TAG, "HTTP Client finished");
|
|
break;
|
|
case HTTP_EVENT_DISCONNECTED:
|
|
ESP_LOGI(TAG, "HTTP Client Disconnected");
|
|
break;
|
|
}
|
|
return ESP_OK;
|
|
}
|
|
|
|
void InfluxDBPublish(std::string _key, std::string _content, std::string _timestamp) {
|
|
char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
|
|
esp_http_client_config_t http_config = {
|
|
.user_agent = "ESP32 Meter reader",
|
|
.method = HTTP_METHOD_POST,
|
|
.event_handler = http_event_handler,
|
|
.buffer_size = MAX_HTTP_OUTPUT_BUFFER,
|
|
.user_data = response_buffer
|
|
};
|
|
|
|
if (_influxDBUser.length() && _influxDBPassword.length()){
|
|
http_config.username = _influxDBUser.c_str();
|
|
http_config.password = _influxDBPassword.c_str();
|
|
http_config.auth_type = HTTP_AUTH_TYPE_BASIC;
|
|
}
|
|
|
|
// generate timestamp (TODO: parse result timestamp passed as string and convert it to POSIX timestamp?)
|
|
time_t now = time(NULL);
|
|
char nowTimestamp[21];
|
|
// pad with zeroes to get nanoseconds
|
|
sprintf(nowTimestamp,"%jd000000000", (intmax_t)now);
|
|
|
|
std::string payload = _influxDBMeasurement + " " + _key + "=" + _content + " " + nowTimestamp;
|
|
payload.shrink_to_fit();
|
|
ESP_LOGI(TAG, "sending line to influxdb: %s\n", payload.c_str());
|
|
|
|
// use the default retention policy of the database
|
|
std::string apiURI = _influxDBURI + "/api/v2/write?bucket=" + _influxDBDatabase + "/";
|
|
apiURI.shrink_to_fit();
|
|
http_config.url = apiURI.c_str();
|
|
ESP_LOGI(TAG, "API URI: %s", apiURI.c_str());
|
|
|
|
esp_http_client_handle_t http_client = esp_http_client_init(&http_config);
|
|
ESP_LOGI(TAG, "client is initialized%s\n", "");
|
|
|
|
esp_http_client_set_header(http_client, "Content-Type", "text/plain");
|
|
ESP_LOGI(TAG, "header is set%s\n", "");
|
|
|
|
ESP_ERROR_CHECK(esp_http_client_set_post_field(http_client, payload.c_str(), payload.length()));
|
|
ESP_LOGI(TAG, "post payload is set%s\n", "");
|
|
|
|
esp_err_t err = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_http_client_perform(http_client));
|
|
|
|
if( err == ESP_OK ) {
|
|
ESP_LOGI(TAG, "HTTP request was performed%s\n", "");
|
|
int status_code = esp_http_client_get_status_code(http_client);
|
|
ESP_LOGI(TAG, "HTTP status code %d\n", status_code);
|
|
} else {
|
|
ESP_LOGW(TAG, "HTTP request failed%s\n", "");
|
|
}
|
|
esp_http_client_cleanup(http_client);
|
|
}
|
|
|
|
|
|
void InfluxDBInit(std::string _uri, std::string _database, std::string _measurement, std::string _user, std::string _password){
|
|
_influxDBURI = _uri;
|
|
_influxDBDatabase = _database;
|
|
_influxDBMeasurement = _measurement;
|
|
_influxDBUser = _user;
|
|
_influxDBPassword = _password;
|
|
|
|
}
|
|
|
|
void InfluxDBdestroy() {
|
|
}
|
|
|
|
#endif //ENABLE_INFLUXDB
|