Merge ~sergiodj/ubuntu-docker-images/+git/templates:fix-repo-ownership-name into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

Proposed by Sergio Durigan Junior
Status: Merged
Approved by: Sergio Durigan Junior
Approved revision: cbdaf7233c7964eabb77dfcb6f6278f50ae6bb3b
Merge reported by: Sergio Durigan Junior
Merged at revision: cbdaf7233c7964eabb77dfcb6f6278f50ae6bb3b
Proposed branch: ~sergiodj/ubuntu-docker-images/+git/templates:fix-repo-ownership-name
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Diff against target: 349 lines (+46/-46)
17 files modified
data/apache2.yaml (+4/-4)
data/bind9.yaml (+2/-2)
data/cassandra.yaml (+1/-1)
data/cortex.yaml (+3/-3)
data/grafana.yaml (+4/-4)
data/kafka.yaml (+1/-1)
data/loki.yaml (+3/-3)
data/memcached.yaml (+1/-1)
data/mysql.yaml (+3/-3)
data/nginx.yaml (+4/-4)
data/postgres.yaml (+3/-3)
data/prometheus-alertmanager.yaml (+3/-3)
data/prometheus.yaml (+5/-5)
data/redis.yaml (+3/-3)
data/squid.yaml (+2/-2)
data/telegraf.yaml (+3/-3)
data/zookeeper.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Valentin Viennot (community) Approve
Athos Ribeiro Approve
Canonical Server Reporter Pending
Review via email: mp+429315@code.launchpad.net

Description of the change

The ownership of the git repositories for the "ubuntu-docker-images" project has recently been changed. They now belong to the ~ubuntu-docker-images team.

This means that we also need to adjust the URLs present in the documentation. For example, the URLs to example configuration files for each image are pointing to the files inside the git repos.

This commit only adjusts the data/*.yaml files. I tried regenerating the documentation but got some exceptions, so I'm leaving this part to Valentin.

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) :
review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks, Sergio!

Revision history for this message
Valentin Viennot (valentinviennot) wrote :

Thanks! I included your changes in my MP https://code.launchpad.net/~valentinviennot/ubuntu-docker-images/+git/ubuntu-server-oci/+merge/429492 to deprecate 21.10 data and other minor changes.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Valentin and Athos.

I won't merge this because Valentin's MP already contains my changes. When he pushes his branch, this MP should be automatically set to Merged.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I think this has been merged elsewhere, so I'm closing it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/apache2.yaml b/data/apache2.yaml
2index 2f8133c..1040e24 100644
3--- a/data/apache2.yaml
4+++ b/data/apache2.yaml
5@@ -61,7 +61,7 @@ parameters:
6 description: Mount and serve a local website.
7 - type: -v
8 value: /path/to/apache2.conf:/etc/apache2/apache2.conf
9- description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)).
10+ description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)).
11 debug:
12 - nothing
13 microk8s:
14@@ -69,10 +69,10 @@ microk8s:
15 files:
16 - key: apache2
17 name: apache2.conf
18- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04
19+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04
20 - key: apache2-site
21 name: index.html
22- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04
23+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04
24 deploy:
25- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04
26+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04
27 access: You will now be able to connect to the apache2 server on `http://localhost:30080`.
28diff --git a/data/bind9.yaml b/data/bind9.yaml
29index 4a52e08..d7ab1f2 100644
30--- a/data/bind9.yaml
31+++ b/data/bind9.yaml
32@@ -49,7 +49,7 @@ parameters:
33 description: The user which will start the `named` process.
34 - type: -v
35 value: /path/to/bind/configuration:/etc/bind/named.conf
36- description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)).
37+ description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)).
38 - type: -v
39 value: /path/to/cached/data:/var/cache/bind
40 description: Location where locally cached data can be dumped.
41@@ -60,5 +60,5 @@ debug:
42 - nothing
43 microk8s:
44 deploy:
45- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04
46+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04
47 access: You will now be able to connect to the Bind9 server on localhost:30053`.
48diff --git a/data/cassandra.yaml b/data/cassandra.yaml
49index 48d9da3..452bf8f 100644
50--- a/data/cassandra.yaml
51+++ b/data/cassandra.yaml
52@@ -91,5 +91,5 @@ debug:
53 - nothing
54 microk8s:
55 deploy:
56- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04
57+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04
58 access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042)
59diff --git a/data/cortex.yaml b/data/cortex.yaml
60index e6aa434..0689a72 100644
61--- a/data/cortex.yaml
62+++ b/data/cortex.yaml
63@@ -73,7 +73,7 @@ parameters:
64 description: Expose Cortex on `localhost:32709`.
65 - type: -v
66 value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml
67- description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)).
68+ description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)).
69 debug:
70 - nothing
71 microk8s:
72@@ -81,7 +81,7 @@ microk8s:
73 files:
74 - key: main-config
75 name: cortex.yaml
76- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04
77+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04
78 deploy:
79- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04
80+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04
81 access: You will now be able to connect to the Cortex server on `localhost:32709`.
82diff --git a/data/grafana.yaml b/data/grafana.yaml
83index d000148..227d7e9 100644
84--- a/data/grafana.yaml
85+++ b/data/grafana.yaml
86@@ -74,16 +74,16 @@ parameters:
87 debug: None
88 microk8s:
89 deploy:
90- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04
91+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04
92 access: You will now be able to connect to the Grafana on `http://localhost:30000`.
93 configmap:
94 files:
95 - key: grafana-datasource
96 name: datasource.yml
97- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04
98+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04
99 - key: grafana-dashboard-definition
100 name: dashboard.yml
101- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04
102+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04
103 - key: grafana-dashboard
104 name: system-stats-dashboard.json
105- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04
106+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04
107diff --git a/data/kafka.yaml b/data/kafka.yaml
108index c995b23..9cddd71 100644
109--- a/data/kafka.yaml
110+++ b/data/kafka.yaml
111@@ -44,5 +44,5 @@ debug:
112 - nothing
113 microk8s:
114 deploy:
115- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
116+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
117 access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.
118diff --git a/data/loki.yaml b/data/loki.yaml
119index e81e6e8..a24b38c 100644
120--- a/data/loki.yaml
121+++ b/data/loki.yaml
122@@ -25,7 +25,7 @@ parameters:
123 description: Expose Grafana Loki on `localhost:3100`.
124 - type: -v
125 value: /local/path/to/config:/etc/loki/local-config.yaml
126- description: Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04).
127+ description: Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04).
128 - type: -v
129 value: lokidata:/loki
130 description: Persist data in a docker volume named `lokidata`.
131@@ -37,7 +37,7 @@ microk8s:
132 files:
133 - key: promtail
134 name: promtail-local-config-k8s.yaml
135- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04
136+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04
137 deploy:
138- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04
139+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04
140 access: You will now be able to connect to the Loki instance on `http://localhost:31000`.
141diff --git a/data/memcached.yaml b/data/memcached.yaml
142index 257d74d..5d11bcf 100644
143--- a/data/memcached.yaml
144+++ b/data/memcached.yaml
145@@ -101,5 +101,5 @@ debug:
146 In this case you can append the flags themselves or a shell script to the run command.
147 microk8s:
148 deploy:
149- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04
150+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04
151 access: Memcached will be listening on port `31211` in your host.
152diff --git a/data/mysql.yaml b/data/mysql.yaml
153index ad75ce0..03adb5d 100644
154--- a/data/mysql.yaml
155+++ b/data/mysql.yaml
156@@ -89,7 +89,7 @@ parameters:
157 description: Persist data instead of initializing a new database every time you launch a new container.
158 - type: -v
159 value: /path/to/config/files/:/etc/mysql/mysql.conf.d/
160- description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)).
161+ description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)).
162 debug:
163 extraparagraph: |
164 #### Initialization Scripts
165@@ -110,7 +110,7 @@ microk8s:
166 files:
167 - key: main-config
168 name: my-custom.cnf
169- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04
170+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04
171 deploy:
172- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04
173+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04
174 access: You will now be able to connect to the MySQL server on `localhost:30306`.
175diff --git a/data/nginx.yaml b/data/nginx.yaml
176index 73febd5..e4219cc 100644
177--- a/data/nginx.yaml
178+++ b/data/nginx.yaml
179@@ -64,7 +64,7 @@ parameters:
180 description: Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`).
181 - type: -v
182 value: /path/to/nginx.conf:/etc/nginx/nginx.conf
183- description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)).
184+ description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)).
185 debug:
186 - nothing
187 microk8s:
188@@ -72,10 +72,10 @@ microk8s:
189 files:
190 - key: nginx
191 name: nginx.conf
192- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04
193+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04
194 - key: nginx-site
195 name: index.html
196- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04
197+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04
198 deploy:
199- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04
200+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04
201 access: You will now be able to connect to the nginx server on `http://localhost:31080`.
202diff --git a/data/postgres.yaml b/data/postgres.yaml
203index 375decc..9e3eb74 100644
204--- a/data/postgres.yaml
205+++ b/data/postgres.yaml
206@@ -80,7 +80,7 @@ parameters:
207 description: Expose Postgres on `localhost:30432`.
208 - type: -v
209 value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf
210- description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)).
211+ description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)).
212 - type: -v
213 value: /path/to/persisted/data:/var/lib/postgresql/data
214 description: Persist data instead of initializing a new database every time you launch a new container.
215@@ -104,7 +104,7 @@ microk8s:
216 files:
217 - key: main-config
218 name: postgresql.conf
219- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04
220+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04
221 deploy:
222- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04
223+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04
224 access: You will now be able to connect to the Postgres server on `localhost:30306`.
225diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml
226index 234416d..8c01e04 100644
227--- a/data/prometheus-alertmanager.yaml
228+++ b/data/prometheus-alertmanager.yaml
229@@ -66,7 +66,7 @@ parameters:
230 description: Expose Prometheus Alertmanager on `localhost:30093`.
231 - type: -v
232 value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml
233- description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)).
234+ description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)).
235 - type: -v
236 value: /path/to/persisted/data:/alertmanager
237 description: "Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container."
238@@ -78,7 +78,7 @@ microk8s:
239 files:
240 - key: alertmanager
241 name: alertmanager.yml
242- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04
243+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04
244 deploy:
245- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04
246+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04
247 access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`.
248diff --git a/data/prometheus.yaml b/data/prometheus.yaml
249index 2ce4e1e..bb5ab1d 100644
250--- a/data/prometheus.yaml
251+++ b/data/prometheus.yaml
252@@ -80,10 +80,10 @@ parameters:
253 description: Expose Prometheus server on `localhost:30090`.
254 - type: -v
255 value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml
256- description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)).
257+ description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)).
258 - type: -v
259 value: /path/to/alerts.yml:/etc/prometheus/alerts.yml
260- description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)).
261+ description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)).
262 debug:
263 - nothing
264 microk8s:
265@@ -91,10 +91,10 @@ microk8s:
266 files:
267 - key: prometheus
268 name: prometheus.yml
269- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04
270+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04
271 - key: prometheus-alerts
272 name: alerts.yml
273- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04
274+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04
275 deploy:
276- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04
277+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04
278 access: You will now be able to connect to the Prometheus on `http://localhost:30090`.
279diff --git a/data/redis.yaml b/data/redis.yaml
280index 7b6089c..d15a64b 100644
281--- a/data/redis.yaml
282+++ b/data/redis.yaml
283@@ -81,7 +81,7 @@ parameters:
284 - type: -v
285 value: /path/to/redis.conf:/etc/redis/redis.conf
286 description: >
287- Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)).
288+ Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)).
289 **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines.
290 debug:
291 network:
292@@ -102,7 +102,7 @@ microk8s:
293 files:
294 - key: redis
295 name: redis.conf
296- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04
297+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04
298 deploy:
299- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04
300+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04
301 access: You will now be able to connect to the Redis server on `localhost:30073`.
302diff --git a/data/squid.yaml b/data/squid.yaml
303index e5c20f6..75c5c9c 100644
304--- a/data/squid.yaml
305+++ b/data/squid.yaml
306@@ -66,7 +66,7 @@ microk8s:
307 files:
308 - key: squid
309 name: squid.conf
310- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04
311+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04
312 deploy:
313- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04
314+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04
315 access: You can now access the squid proxy on port 3128
316diff --git a/data/telegraf.yaml b/data/telegraf.yaml
317index aacae43..0aeb54f 100644
318--- a/data/telegraf.yaml
319+++ b/data/telegraf.yaml
320@@ -61,7 +61,7 @@ parameters:
321 description: Expose Telegraf on `localhost:30273`.
322 - type: -v
323 value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf
324- description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)).
325+ description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)).
326 debug:
327 - nothing
328 microk8s:
329@@ -69,7 +69,7 @@ microk8s:
330 files:
331 - key: main-config
332 name: telegraf.conf
333- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04
334+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04
335 deploy:
336- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04
337+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04
338 access: You will now be able to connect to the Telegraf server on `localhost:30073`.
339diff --git a/data/zookeeper.yaml b/data/zookeeper.yaml
340index 213225a..eb5beef 100644
341--- a/data/zookeeper.yaml
342+++ b/data/zookeeper.yaml
343@@ -32,5 +32,5 @@ debug:
344 - nothing
345 microk8s:
346 deploy:
347- link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
348+ link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04
349 access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service.

Subscribers

People subscribed via source and target branches