From 08f47c2f4cd252a27b242db709ac9e8dc6ca0b87 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sun, 11 Jun 2023 20:04:23 +0200 Subject: [PATCH 1/3] Fix: Prometheus syntax error with wifi_bssid Fixes #1021 --- src/WebApi_prometheus.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp index 62f95c634..e5f289a9e 100644 --- a/src/WebApi_prometheus.cpp +++ b/src/WebApi_prometheus.cpp @@ -53,9 +53,9 @@ void WebApiPrometheusClass::onPrometheusMetricsGet(AsyncWebServerRequest* reques stream->print("# TYPE wifi_rssi gauge\n"); stream->printf("wifi_rssi %d\n", WiFi.RSSI()); - stream->print("# HELP wifi_bssid WiFi BSSID\n"); - stream->print("# TYPE wifi_bssid gauge\n"); - stream->printf("wifi_bssid %s\n", WiFi.BSSIDstr().c_str()); + stream->print("# HELP wifi_station WiFi Station info\n"); + stream->print("# TYPE wifi_station label\n"); + stream->printf("wifi_station{bssid=\"%s\"} 1\n", WiFi.BSSIDstr().c_str()); for (uint8_t i = 0; i < Hoymiles.getNumInverters(); i++) { auto inv = Hoymiles.getInverterByPos(i); From 88de38e694933d77c702cc817337520512f16a15 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sun, 11 Jun 2023 20:07:41 +0200 Subject: [PATCH 2/3] Doc: Add hint to adjusted partition upgrade guide to use only one .bin file --- docs/UpgradePartition.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/UpgradePartition.md b/docs/UpgradePartition.md index 429e5f581..f2cd8bf9a 100644 --- a/docs/UpgradePartition.md +++ b/docs/UpgradePartition.md @@ -12,13 +12,10 @@ There are several possibilities to update the partition table: - Any kind of flash interface - If you like to use any kind of flash interface like `esptool.py`, Espressif Flash Download Tool, ESP_Flasher or esptool-js you have to make sure to upload **ALL** provided .bin files. It is important to enter the correct target addresses. + If you like to use any kind of flash interface like `esptool.py`, Espressif Flash Download Tool, ESP_Flasher or esptool-js you have to make sure to upload the provided .factory.bin file. It is important to enter the correct target address. | Address | File | | ---------| ---------------------- | - | 0x1000 | bootloader.bin | - | 0x8000 | partitions.bin | - | 0xe000 | boot_app0.bin | - | 0x10000 | opendtu-*.bin | + | 0x0 | opendtu-*.factory.bin | After upgrading the ESP32 will open the intergrated access point (AP) again. Just connect to it using the default password ("openDTU42"). If you are connected, just visit and enter the "Configuration Management". Recover the previously backuped config files. From ee4b479b7df7f3ad3aa2eeb38a25bbb6e236fed2 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sun, 11 Jun 2023 21:00:14 +0200 Subject: [PATCH 3/3] webapp: Update dependencies --- webapp/package.json | 4 ++-- webapp/yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 9431e2d55..5a782910b 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -26,7 +26,7 @@ "@rushstack/eslint-patch": "^1.3.1", "@tsconfig/node18": "^2.0.1", "@types/bootstrap": "^5.2.6", - "@types/node": "^20.2.5", + "@types/node": "^20.3.0", "@types/sortablejs": "^1.15.1", "@types/spark-md5": "^3.0.2", "@vitejs/plugin-vue": "^4.2.3", @@ -35,7 +35,7 @@ "eslint": "^8.42.0", "eslint-plugin-vue": "^9.14.1", "npm-run-all": "^4.1.5", - "sass": "^1.62.2", + "sass": "^1.62.3", "terser": "^5.17.7", "typescript": "^5.1.3", "vite": "^4.3.9", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 5888d035c..e3cbb1ec6 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -372,10 +372,10 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== -"@types/node@^20.2.5": - version "20.2.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.5.tgz#26d295f3570323b2837d322180dfbf1ba156fefb" - integrity sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ== +"@types/node@^20.3.0": + version "20.3.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.0.tgz#719498898d5defab83c3560f45d8498f58d11938" + integrity sha512-cumHmIAf6On83X7yP+LrsEyUOf/YlociZelmpRYaGFydoaPdxdt80MAbu6vWerQT2COCp2nPvHdsbD7tHn/YlQ== "@types/semver@^7.3.12": version "7.3.13" @@ -2220,10 +2220,10 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -sass@^1.62.2: - version "1.63.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.2.tgz#75f7d9a8e67d1d5b98a989507f4d98b6067b1f75" - integrity sha512-u56TU0AIFqMtauKl/OJ1AeFsXqRHkgO7nCWmHaDwfxDo9GUMSqBA4NEh6GMuh1CYVM7zuROYtZrHzPc2ixK+ww== +sass@^1.62.3: + version "1.63.3" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.3.tgz#527746aa43bf2e4eac1ab424f67f6f18a081061a" + integrity sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0"