Skip to content

Commit

Permalink
Doc rework progression #1686
Browse files Browse the repository at this point in the history
  • Loading branch information
dennissiemensma committed Jan 7, 2025
1 parent ed2cc57 commit 371015f
Show file tree
Hide file tree
Showing 54 changed files with 274 additions and 931 deletions.
20 changes: 10 additions & 10 deletions documentation/docs/explained/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ If your meter supports it, you can also see your gas consumption and electricity

The live graphs plots the most recent data available, depending on the capabilities of your smart meter.

![Screenshot](../static/screenshots/about-dsmrreader/live.png)
![Live](../static/screenshots/about-dsmrreader/live.png)

----

Expand All @@ -71,7 +71,7 @@ The live graphs plots the most recent data available, depending on the capabilit
The archive allows you to scroll through all historisch data captured by the application.
All data can be viewed on different levels: by day, by month and by year.

![Screenshot](../static/screenshots/about-dsmrreader/archive.png)
![Archive](../static/screenshots/about-dsmrreader/archive.png)

----

Expand All @@ -81,7 +81,7 @@ All data can be viewed on different levels: by day, by month and by year.
This page allows you to simply compare two days, months or years with each other.
It will also display the difference between each other as a percentage.

![Screenshot](../static/screenshots/about-dsmrreader/compare.png)
![Compare](../static/screenshots/about-dsmrreader/compare.png)

----

Expand All @@ -90,7 +90,7 @@ It will also display the difference between each other as a percentage.

This page displays a summary of your average daily consumption and habits.

![Screenshot](../static/screenshots/about-dsmrreader/trends.png)
![Trends](../static/screenshots/about-dsmrreader/trends.png)

----

Expand All @@ -100,15 +100,15 @@ This page displays a summary of your average daily consumption and habits.
This page displays your meter positions and statistics provided by the DSMR protocol.
You can also find the number of readings stored and any excesses regarding consumption.

![Screenshot](../static/screenshots/about-dsmrreader/statistics.png)
![Statistics](../static/screenshots/about-dsmrreader/statistics.png)

----

### Energy contracts

Summary of all your contracts and the amount of energy consumed/generated.

![Screenshot](../static/screenshots/about-dsmrreader/energy-contracts.png)
![Energy contracts](../static/screenshots/about-dsmrreader/energy-contracts.png)

----

Expand All @@ -117,7 +117,7 @@ Summary of all your contracts and the amount of energy consumed/generated.

This pages allows you to export all day or hour statistics to CSV.

![Screenshot](../static/screenshots/about-dsmrreader/export.png)
![Export](../static/screenshots/about-dsmrreader/export.png)

----

Expand All @@ -127,7 +127,7 @@ This pages allows you to export all day or hour statistics to CSV.
Shows the 'health' of the application. Any issues will be reported here.
You can also easily check for DSMR-reader updates here.

![Screenshot](../static/screenshots/about-dsmrreader/about.png)
![About](../static/screenshots/about-dsmrreader/about.png)

----

Expand All @@ -136,7 +136,7 @@ You can also easily check for DSMR-reader updates here.

Assists you in finding the information required for debugging your installation or any issues.

![Screenshot](../static/screenshots/about-dsmrreader/support.png)
![Support](../static/screenshots/about-dsmrreader/support.png)

----

Expand All @@ -148,4 +148,4 @@ The configuration page is the entrypoint for the admin interface.
You can type any topic or setting you're searching for, as it should pop up with clickable deeplink to the admin panel.
Or you can just skip it this page and continue directly to the admin panel.

![Screenshot](../static/screenshots/about-dsmrreader/configuration.png)
![Configuration](../static/screenshots/about-dsmrreader/configuration.png)
15 changes: 15 additions & 0 deletions documentation/docs/how-to/admin/backup_dropbox.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Admin settings: Dropbox

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.


!!! failure "Deprecated feature"

The Dropbox feature will be **dropped** from DSMR-reader in a future release.

Reworking DSMR-reader to a Docker/container-only setup allows for generic third party integrations more easily.
E.g. mounting the DSMR-reader backup by a Dropbox/OneDrive/GoogleDrive compatible container instead.
14 changes: 14 additions & 0 deletions documentation/docs/how-to/admin/email_backup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Admin settings: Email backup

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.

!!! failure "Deprecated feature"

The email feature will be **dropped** from DSMR-reader in a future release.

Reworking DSMR-reader to a Docker/container-only setup allows for generic third party integrations more easily.
E.g. mounting the DSMR-reader backup by another container instead that can dispatch email.
15 changes: 15 additions & 0 deletions documentation/docs/how-to/admin/influxdb.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Admin settings: InfluxDB

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.

!!! failure "Deprecated feature"

The Dropbox feature will be **dropped** from DSMR-reader in a future release.

Reworking DSMR-reader to a Docker/container-only setup allows for generic third party integrations more easily.

E.g. creating a [plugin script using post-processing hooks](../../reference/plugins.md) or a container that reads the DSMR-reader API and passed it to InfluxDB instead.
30 changes: 30 additions & 0 deletions documentation/docs/how-to/admin/mindergas.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Admin settings: MinderGas.nl

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.

Link your MinderGas.nl-account to have DSMR-reader upload your gas meter position daily.

!!! note

DSMR-reader transmits the **last reading of the previous day** to your account.

Also, to avoid overloading the MinderGas API by all DSMR-reader installations simultaneously, the export is **randomly** scheduled every night between 03:00 and 06:00.

![MinderGas settings](../../static/screenshots/admin/mindergassettings.png)

Make sure you have a [Mindergas.nl](http://mindergas.nl) account or signup for one.
Now go to "**Meterstand API**" and click on the button located below "**Authenticatietoken**".

![Mindergas API](../../static/screenshots/admin/mindergas_api.png)

Copy the authentication token generated and paste in into the DSMR-reader settings for the Mindergas.nl-configuration.
Obviously the export only works when there are any gas readings at all, and when you have ticked the 'export' checkbox in the Mindergas.nl-configuration.

!!! question "Why not uploading old data?"

Please note that due to policies of mindergas.nl it's not allowed to retroactively upload meter positions using the API.
Therefor this is not supported by the application. You can however, enter them manually on their website.
41 changes: 41 additions & 0 deletions documentation/docs/how-to/admin/mqtt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Admin settings: MQTT

[TOC]

The application has native support for MQTT. In the screen displayed below you can enter all information about the broker you're using.

![Broker settings](../../static/screenshots/admin/mqttbrokersettings.png)

There are multiple configurations available for sending MQTT messages to your broker.
You can enable them separately, depending on your needs.
Many of these also allow you to define which fields are sent and how they should be identified in messages sent to the broker.

## Day totals

This allows you to receive the day totals in JSON format:

![MQTT JSON day Totals](../../static/screenshots/admin/jsondaytotalsmqttsettings.png)

The same data, but split among topics. This allows you to post a single piece of data on a separate topic:

![MQTT Split Topic Day Totals](../../static/screenshots/admin/splittopicdaytotalsmqttsettings.png)

## Meter statistics

Statistics of your meter, split among topics:

![MQTT Split Topic Meter Statistics](../../static/screenshots/admin/splittopicmeterstatisticsmqttsettings.png)

## Telegram

Telegram in JSON format:

![MQTT JSON Telegram](../../static/screenshots/admin/jsontelegrammqttsettings.png)

Or split among topics:

![MQTT Split Topic Telegram](../../static/screenshots/admin/splittopictelegrammqttsettings.png)

Or in raw DSMR protocol format (when available):

![MQTT Raw Telegram](../../static/screenshots/admin/rawtelegrammqttsettings.png)
103 changes: 103 additions & 0 deletions documentation/docs/how-to/admin/notifications.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# Admin settings: Notifications

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.

Notifications on your phone using Prowl, Pushover or Telegram.

[TOC]

!!! note

Please note that DSMR-reader will reset and wipe notification settings **on any error**.

This may be perceived as annoying behaviour, but it prevents endless loops and notification spam in some unfortunate situations.

![Notification settings](../../static/screenshots/admin/notificationsetting.png)

Currently, two mobile platforms are supported: Android and iOS.

* The supported apps for Android are [Pushover](https://pushover.net) and [Telegram](https://www.telegram.org).
* The supported apps for iOS are [Pushover](https://pushover.net), [Prowl](https://www.prowlapp.com) and [Telegram](https://www.telegram.org).

Make sure you either have Pushover, Prowl or Telegram installed on your smartphone.
If you don't, visit your platforms app store to download the app and sign up for an account.
Then, make sure to get your API key from the notification service that you prefer.
For instruction on obtaining the API key, please read below.

In the DSMR-reader **Notifications Apps** settings, select the notification service you want to use.
Copy the API key from the notification service and paste in into the textbox for the API key.
When you save these settings, your first notification should be sent after midnight.
Don't worry about nightly alerts, the notifications will be sent with low priority and should not wake you up.


## Pushover: How do I obtain my API key?

After you have downloaded Pushover and signed up for an account you should be able to login into your [Pushover](https://pushover.net) account.

You should see an overview of containing **Your User Key** (top right) and Applications, if you have any.
To create an application in Pushover, for sending notifications to your phone, please click **Create an Application/API Token**.

Pushover requires you to enter two keys in DSMR-reader.

* You will need the **User Key** displayed on the top right in the screenshot below.
* And you will need the **API key** for the application you've created in Pushover.

![Pushover Get Your API Key](../../static/screenshots/admin/notifications-pushover-get-key.png)

## Prowl: How do I obtain my API key?

After you have downloaded Prowl and signed up for an account you should be able to log in into your [Prowl](https://www.prowlapp.com) account.

Now go to "API Keys", you should see an overview of your current API keys if you have any.
To create an API key for the DSMR-reader, input a name and click **"Generate Key"**.

![Prowl My Account overview](../../static/screenshots/admin/notifications-prowl-create-key.png)

When a new key is generated, you will see it immediately. Your key is listed like in the screenshot below (the red box marks your API key).

![Prowl Get Your API Key](../../static/screenshots/admin/notifications-prowl-get-key.png)


## Telegram: How do I obtain my API key?

Please note that you can only use these notifications if you have your own (chat) bot with Telegram.

More information about bots [can be found here](https://core.telegram.org/bots). You will need the API key provided to you by the ``BotFather`` bot.

## Telegram: How do I obtain the Chat ID?

You will also need the Chat ID to have the bot send messages to the right chat.

!!! hint

By default, bots are not allowed to contact anyone by themselves or see messages in a group.

So first make sure to send a message directly to the bot as human.
Or, if you added the bot in a group, make sure it has permissions to read messages in the group and then send a message in the group accordingly.

Any message the bot receives (or is allowed to see) is sent as update to the bot.
You can use the Telegram API in your browser to see the updates for your bot.
It will contain the Chat ID you're looking for.

Construct the following URL:

```
https://api.telegram.org/bot<APIkey>/getUpdates?offset=-1
```

For example when using the fake API key ``1268827887:ABCDEFGqdtsgtts-JDASIJDqewqkqewaq``::

```
https://api.telegram.org/bot1268827887:ABCDEFGqdtsgtts-JDASIJDqewqkqewaq/getUpdates?offset=-1
```

You should see something similar to:

![Telegram Chat ID](../../static/screenshots/admin/notifications-telegram-chat-id.png)

Extract the Chat ID from the response. In the example above it's ``123456789``.
You can use that ID in the Telegram notifications config of DSMR-reader.
34 changes: 34 additions & 0 deletions documentation/docs/how-to/admin/pvoutput.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Admin settings: PVOutput.org

!!! abstract "For your information"

This is a feature using or integrating a **third party** and may or may not break along the years.

Usually this depends on the third party supporting it and the amount of (re)work needed in DSMR-reader to keep it backward/forward compatible.

Make sure you have a [PVOutput.org](https://pvoutput.org) account, or signup for an account.
You will have to configure your account and PV system(s). For any support doing that, please [see this page](https://pvoutput.org/help.html#overview-getting-started) for more information.

In order to link DSMR-reader to your account, please write down the "API Key" and "System ID" from your PVOutput account. You can find them near the bottom of the "Settings" page in PVOutput.

![PVOutput account settings](../../static/screenshots/admin/external_pvoutput_settings.png)


Enter those values in DSMR-reader's admin pages, at "PVOutput: API configuration". Make sure to enter both:

* API Key
* System ID

![PVOutput API settings](../../static/screenshots/admin/pvoutput_api.png)


Now navigate to another settings page in DSMR-reader: "PVOutput: "Add Status" configuration".

* Enable uploading the consumption.
* Choose an interval between the uploads. You can configure this as well on the PVOutput's end, in Device Settings.
* Optionally, choose an upload delay X (in minutes). If set, DSMR-reader will not use data of the past X minutes.
* Optionally, you can choose to enter a **processing delay in minutes** for PVOutput. Please note that PVOutput will only allow this when you have a **"Donation" account** on their website. If you do not have one, they will reject each API call you make, until you disable (clear) this option in DSMR-reader.

![PVOutput Add Status](../../static/screenshots/admin/pvoutputaddstatussettings.png)

If you configured everything correctly, you should see some additional data in PVOutput listed under "Your Outputs" momentarily.
File renamed without changes.
File renamed without changes.
13 changes: 10 additions & 3 deletions documentation/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ See sidebar for a more specific navigation or below for a (global) overview.

## [About DSMR-reader](explained/about.md#about-dsmr-reader)
## [Contributions](explained/hall-of-fame.md#contributions)
## [Developing DSMR-reader](how-to/development.md#developing-dsmr-reader)
## [Donating](how-to/donating.md#donating)
## [Admin settings: Dropbox](how-to/admin/backup_dropbox.md#admin-settings-dropbox)
## [Admin settings: Email backup](how-to/admin/email_backup.md#admin-settings-email-backup)
## [Admin settings: InfluxDB](how-to/admin/influxdb.md#admin-settings-influxdb)
## [Admin settings: MinderGas.nl](how-to/admin/mindergas.md#admin-settings-mindergasnl)
## [Admin settings: MQTT](how-to/admin/mqtt.md#admin-settings-mqtt)
## [Admin settings: Notifications](how-to/admin/notifications.md#admin-settings-notifications)
## [Admin settings: PVOutput.org](how-to/admin/pvoutput.md#admin-settings-pvoutputorg)
## [Developing DSMR-reader](how-to/supporting/development.md#developing-dsmr-reader)
## [Donating](how-to/supporting/donating.md#donating)
## [Third party guides](how-to/third-party/third-party-guides.md#third-party-guides)
## [API](reference/API.md#api)
## [API](reference/api.md#api)
## [Environment variables](reference/environment-variables.md#environment-variables)
## [Plugins](reference/plugins.md#plugins)
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ The application has a REST API, allowing you to insert/create readings and retri
## Configuration
You can access the API documentation by selecting the **Support** menu item in DSMR-reader.

![Screenshot](../static/screenshots/api/support.png)
![Screenshot](../static/screenshots/admin/support.png)


### Enable API
The API is **disabled** by default in the application. You may enable it in the **Configuration**.

![Screenshot](../static/screenshots/api/api-settings.png)
![Screenshot](../static/screenshots/admin/api-settings.png)


## API key
Expand Down
File renamed without changes
File renamed without changes
Binary file removed legacy-docs/_static/faq/dropbox_app_permissions.png
Binary file not shown.
Binary file removed legacy-docs/_static/faq/dropbox_app_token.png
Binary file not shown.
Binary file removed legacy-docs/_static/faq/dropbox_apps_overview.png
Binary file not shown.
Binary file removed legacy-docs/_static/faq/dropbox_create_app.png
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 371015f

Please sign in to comment.