Merge ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:usage-readme into charm-k8s-unifi-poller:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: ef37142662713647d469bde986abfc7dbae3661f
Merged at revision: f9ba43511ba563c4652b1ad89989c92663415a75
Proposed branch: ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:usage-readme
Merge into: charm-k8s-unifi-poller:master
Diff against target: 76 lines (+31/-27)
1 file modified
README.md (+31/-27)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+395077@code.launchpad.net

Commit message

Update README to favour deployment from the charmstore with default image

Description of the change

Update README to favour deployment from the charmstore with default image

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Gareth Woolridge (moon127) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f9ba43511ba563c4652b1ad89989c92663415a75

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index e42a63b..15fc889 100644
3--- a/README.md
4+++ b/README.md
5@@ -10,7 +10,37 @@ See [Unifi Poller github page](https://github.com/unifi-poller/unifi-poller) and
6
7 ## Usage
8
9-For config options see descriptions in config.yaml.
10+To deploy into a k8s model:
11+
12+ juju deploy cs:~unifi-poller-charmers/unifi-poller
13+
14+The charm will not function without connection details for a Unifi Network Controller. You will need to create a read-only admin user on the controller with access to all sites by following [prerequisite steps from the wiki](https://github.com/unifi-poller/unifi-poller/wiki/Installation#prerequisites), then:
15+
16+ juju config unifi_poller controller_url="https://<ip_address>:8443"
17+ juju config unifi_poller controller_username=unifipoller
18+ juju config unifi_poller controller_password=unifipoller
19+
20+Optionally we can also enable DPI (Deep Packet Inspection) data collection from the Controller. To utilise this there must be at least one site using a Unifi Security Gateway product such as the USG or UDM devices or their Pro variants, and such a site must also have DPI enabled in site configuration, then:
21+
22+ juju config unifi_poller controller_dpi=true
23+
24+Configuring the controller URL, and credentials is sufficient config to configure polling and to enable the prometheus endpoint on http://<pod/cluster_IP>:9130/metrics
25+
26+To expose that endpoint outside the k8s cluster via the ingress e.g.:
27+
28+ juju config unifi-poller juju-external-hostname="unifi-poller.example.domain"
29+ juju expose unifi-poller
30+
31+This will expose the service via the kubernetes nginx ingress via a virtual host, e.g. http://unifi-poller.example.com/metrics
32+
33+The charm optionally supports an externally deployed InfluxDB instance which may be preferred for longer term data storage. This could be deployed outside the cluster in a suitable juju model using juju deploy cs:influxdb. The Unifi Poller charm supports authentication to the InfluxDB instance, if required:
34+
35+ juju config unifi-poller influxdb_url="https://<ip_address>:8086"
36+ juju config unifi-poller influxdb_dbname=unifi
37+ juju config unifi-poller influxdb_username=unifipoller
38+ juju config unifi=poller influxdb_password=unifipoller
39+
40+## Local Development
41
42 Notes for deploying a test setup locally using microk8s:
43
44@@ -39,32 +69,6 @@ Notes for deploying a test setup locally using microk8s:
45 juju wait
46 juju status
47
48-The charm will not function without connection details for a Unifi Network Controller. You will need to create a read-only admin user on the controller with access to all sites by following [prerequisite steps from the wiki](https://github.com/unifi-poller/unifi-poller/wiki/Installation#prerequisites), then:
49-
50- juju config unifi_poller controller_url="https://<ip_address>:8443"
51- juju config unifi_poller controller_username=unifipoller
52- juju config unifi_poller controller_password=unifipoller
53-
54-Optionally we can also enable DPI (Deep Packet Inspection) data collection from the Controller. To utilise this there must be at least one site using a Unifi Security Gateway product such as the USG or UDM devices or their Pro variants, and such a site must also have DPI enabled in site configuration, then:
55-
56- juju config unifi_poller controller_dpi=true
57-
58-Configuring the controller URL, and credentials is sufficient config to configure polling and to enable the prometheus endpoint on http://<pod/cluster_IP>:9130/metrics
59-
60-To expose that endpoint outside the k8s cluster via the ingress eg:
61-
62- juju config unifi-poller juju-external-hostname="unifi-poller.example.domain"
63- juju expose unifi-poller
64-
65-This will expose the service via the kubernetes nginx ingress via a virtual host, eg http://unifi-poller.example.com/metrics
66-
67-The charm optionally supports an externally deployed InfluxDB instance which may be preferred for longer term data storage. This could be deployed outside the cluster in a suitable juju model using juju deploy cs:influxdb. The Unifi Poller charm supports authentication to the InfluxDB instance, if required:
68-
69- juju config unifi-poller influxdb_url="https://<ip_address>:8086"
70- juju config unifi-poller influxdb_dbname=unifi
71- juju config unifi-poller influxdb_username=unifipoller
72- juju config unifi=poller influxdb_password=unifipoller
73-
74 ### Additional Controllers / Config Options
75
76 The Unifi Poller charm supports configuring additional controllers and additional options, which can be added via the extra_configs charm option.

Subscribers

People subscribed via source and target branches