⬆️ Updating add-on Glances to a0a700b

README.md

@@ -805,10 +805,10 @@ SOFTWARE.
 [foldingathome-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [foldingathome-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [foldingathome-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-glances]: https://github.com/hassio-addons/addon-glances/tree/eda9066
+[addon-glances]: https://github.com/hassio-addons/addon-glances/tree/a0a700b
-[addon-doc-glances]: https://github.com/hassio-addons/addon-glances/blob/eda9066/README.md
+[addon-doc-glances]: https://github.com/hassio-addons/addon-glances/blob/a0a700b/README.md
 [glances-issue]: https://github.com/hassio-addons/addon-glances/issues
-[glances-version-shield]: https://img.shields.io/badge/version-eda9066-blue.svg
+[glances-version-shield]: https://img.shields.io/badge/version-a0a700b-blue.svg
 [glances-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [glances-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [glances-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg

glances/CHANGELOG.md

@@ -1,4 +1,13 @@
 # Changelog since v0.17.2
+- add support influxdb2 (#311)Co-authored-by: Franck Nijhof <git@frenck.dev>
+
+* add support influxdb2
+
+* Tiny cleanup/styling
+
+---------
+
+Co-authored-by: Franck Nijhof <git@frenck.dev> 
 - Bump bottle from 0.12.23 to 0.12.25 in /glances (#322)Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 
 Bumps [bottle](https://github.com/bottlepy/bottle) from 0.12.23 to 0.12.25.

glances/DOCS.md

@@ -39,12 +39,20 @@ influxdb:
   enabled: false
   host: a0d7b954-influxdb
   port: 8086
+  interval: 60
+  ssl: false
+  prefix: localhost
+  version: 1 # Either 1 or 2
+
+  # Version 1
   username: glances
   password: "!secret glances_influxdb_password"
   database: glances
-  prefix: localhost
+
-  interval: 60
+  # Version 2
-  ssl: false
+  token: "!secret glances_influxdb2_token"
+  bucket: glances
+  org: myorg
 ```
 
 **Note**: _This is just an example, don't copy and paste it! Create your own!_
@@ -119,28 +127,6 @@ use `a0d7b954-influxdb` as the hostname._
 
 The port on which InfluxDB is listening.
 
-#### Option `influxdb`: `username`
-
-The username that you have created for Glances to authenticate against
-InfluxDB.
-
-#### Option `influxdb`: `password`
-
-The password for the above username option.
-
-#### Option `influxdb`: `database`
-
-The name of the database to store all Glances information into.
-
-**Note**: _It is strongly recommended to create a separate database for glances
-and not store this in the same database name as Home Assistant._
-
-#### Option `prefix`: `localhost`
-
-The hostname to append for exported data.
-
-**Note**: _For the Grafana Glances dashboard set this to `localhost`._
-
 #### Option `influxdb`: `interval`
 
 Defines the interval (in seconds) on how often Glances exports data to InfluxDB.
@@ -151,6 +137,60 @@ Adding this option will allow SSL to be used on the InfluxDB connection. If not
 set will default to `false` which is the required setting for the Community
 InfluxDB add-on.
 
+#### Option `influxdb`: `prefix`
+
+The hostname to append for exported data.
+
+**Note**: _For the Grafana Glances dashboard set this to `localhost`._
+
+#### Option `influxdb`: `version`
+
+The influxdb version to connecting. Either **1** or **2**.
+
+#### Option `influxdb`: `username`
+
+> Applied to version 1 only
+
+The username that you have created for Glances to authenticate against
+InfluxDB.
+
+#### Option `influxdb`: `password`
+
+> Applied to version 1 only
+
+The password for the above username option.
+
+#### Option `influxdb`: `database`
+
+> Applied to version 1 only
+
+The name of the database to store all Glances information into.
+
+**Note**: _It is strongly recommended to create a separate database for glances
+and not store this in the same database name as Home Assistant._
+
+#### Option `influxdb`: `token`
+
+> Applied to version 2 only
+
+An InfluxDB token with permissions to write to the given bucket. This should
+look like `t9iHPiGQyg0ds4K1IlBrCyBsNGh71dkdR6u8Y9eeR37UzfGuFukFCdbMI4YA9EtKb4zr5coFXKw67tbBEP7CPw==`
+
+#### Option `influxdb`: `bucket`
+
+> Applied to version 1 only
+
+The name of the bucket to store all Glances information into.
+
+**Note**: _It is strongly recommended to create a separate bucket for glances
+and not store this in the same bucket as Home Assistant._
+
+#### Option `influxdb`: `organization`
+
+> Applied to version 1 only
+
+The InfluxDB organization that owns the given bucket.
+
 ## Adding Glances as a sensor into Home Assistant
 
 The Home Assistant Glances sensor platform is consuming the system information

glances/README.md

@@ -49,6 +49,6 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-eda9066-blue.svg
+[release-shield]: https://img.shields.io/badge/version-a0a700b-blue.svg
-[release]: https://github.com/hassio-addons/addon-glances/tree/eda9066
+[release]: https://github.com/hassio-addons/addon-glances/tree/a0a700b
 [screenshot]: https://github.com/hassio-addons/addon-glances/raw/main/images/screenshot.png

glances/config.yaml

@@ -1,24 +1,25 @@
-apparmor: false
+name: Glances
+version: a0a700b
+slug: glances
+description: A cross-platform system monitoring tool
+url: https://github.com/hassio-addons/addon-glances
+codenotary: codenotary@frenck.dev
+ingress: true
+ingress_port: 0
+ingress_stream: true
+panel_icon: mdi:speedometer
+startup: services
+homeassistant: 0.92.0b2
 arch:
 - aarch64
 - amd64
 - armhf
 - armv7
 - i386
-auth_api: true
+ports:
-codenotary: codenotary@frenck.dev
+  80/tcp: null
-description: A cross-platform system monitoring tool
+ports_description:
-docker_api: true
+  80/tcp: Web interface (Not required for Ingress)
-environment:
-  LOG_FORMAT: '{LEVEL}: {MESSAGE}'
-hassio_api: true
-homeassistant: 0.92.0b2
-host_network: true
-host_pid: true
-image: ghcr.io/hassio-addons/glances/{arch}
-ingress: true
-ingress_port: 0
-ingress_stream: true
 map:
 - addons
 - backup
@@ -26,47 +27,51 @@ map:
 - share
 - ssl
 - media
-name: Glances
+hassio_api: true
+auth_api: true
+docker_api: true
+host_network: true
+host_pid: true
+apparmor: false
 options:
-  certfile: fullchain.pem
-  influxdb:
-    database: glances
-    enabled: false
-    host: a0d7b954-influxdb
-    interval: 60
-    password: ''
-    port: 8086
-    prefix: localhost
-    username: glances
-  keyfile: privkey.pem
   log_level: info
   process_info: false
   refresh_time: 10
   ssl: false
-panel_icon: mdi:speedometer
+  certfile: fullchain.pem
-ports:
+  keyfile: privkey.pem
-  80/tcp: null
-ports_description:
-  80/tcp: Web interface (Not required for Ingress)
-schema:
-  certfile: str
   influxdb:
-    database: str
+    enabled: false
-    enabled: bool
+    host: a0d7b954-influxdb
-    host: str
+    port: 8086
-    interval: int
+    interval: 60
-    password: password
+    ssl: false
-    port: port
+    version: 1
-    prefix: str
+    username: glances
-    ssl: bool?
+    password: ''
-    username: str
+    database: glances
-  keyfile: str
+    prefix: localhost
-  leave_front_door_open: bool?
+    token: ''
+    bucket: glances
+    org: myorg
+schema:
   log_level: list(trace|debug|info|notice|warning|error|fatal)
   process_info: bool
   refresh_time: int
   ssl: bool
-slug: glances
+  certfile: str
-startup: services
+  keyfile: str
-url: https://github.com/hassio-addons/addon-glances
+  influxdb:
-version: eda9066
+    enabled: bool
+    host: str
+    port: port
+    username: str
+    password: password
+    database: str
+    prefix: str
+    interval: int
+    ssl: bool?
+  leave_front_door_open: bool?
+environment:
+  LOG_FORMAT: '{LEVEL}: {MESSAGE}'
+image: ghcr.io/hassio-addons/glances/{arch}