Merge ~esunar/charm-graylog:jammy-support into charm-graylog:master

[Erhan Sunar]

Added jammy functional tests

[Erhan Sunar (esunar)]

[lint](https://pastebin.canonical.com/p/5KTH5cBQkb/)
[unittest](https://pastebin.canonical.com/p/5D2pDr6jQz/)
[functional](https://pastebin.canonical.com/p/MfPFJrp34z/)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d2b3701f88118fe766234fb288e32c2dfbb70a1e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/152/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/917/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1342/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/152//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d2b3701f88118fe766234fb288e32c2dfbb70a1e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/153/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/922/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1347/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/153//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d2b3701f88118fe766234fb288e32c2dfbb70a1e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/154/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/930/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1354/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/154//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d2b3701f88118fe766234fb288e32c2dfbb70a1e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/155/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/931/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1355/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/155//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d2b3701f88118fe766234fb288e32c2dfbb70a1e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/156/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/932/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1356/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/156//rebuild

review: Needs Fixing (continuous-integration)

[Tianqi Xiao (txiao)]

Thanks for the MP. Please consider my suggestions inline.

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/157/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/941/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1364/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/157//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/158/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/944/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1367/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/158//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/159/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/946/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1369/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/159//rebuild

review: Needs Fixing (continuous-integration)

[Erhan Sunar (esunar)]

> Thanks for the MP. Please consider my suggestions inline.

Applied all the mentioned suggestions

[Tianqi Xiao (txiao)]

LGTM. Please check the issue with CI and fix it before merging.

review: Approve

[Martin Kalcok (martin-kalcok)]

See inline comment please.

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/160/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/983/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1406/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/160//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/161/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/984/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1407/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/161//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/162/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/994/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1413/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/162//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/163/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/995/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1414/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/163//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/164/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/996/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1415/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/164//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3679d8c9c54f00eb339ca59310d02853c00c4db3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/165/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1010/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1424/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/165//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:ce908d66ebdfb0fdbf4060257ab45951ee0ced4d
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/166/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1015/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1431/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/166//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b5000fb226b8f6112dd01869aa26373f3b2bd31a
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/167/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1016/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1432/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/167//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b5000fb226b8f6112dd01869aa26373f3b2bd31a
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/168/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1017/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1433/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/168//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b5000fb226b8f6112dd01869aa26373f3b2bd31a
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/169/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1019/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1435/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/169//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b5000fb226b8f6112dd01869aa26373f3b2bd31a
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/170/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1024/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1436/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/170//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b5000fb226b8f6112dd01869aa26373f3b2bd31a
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/171/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1025/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1438/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/171//rebuild

review: Needs Fixing (continuous-integration)

[Erhan Sunar (esunar)]

functional tests updated: https://pastebin.canonical.com/p/MfPFJrp34z/

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:cd37f6f387f59dfda67d50dda22d94745d3a9151
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/172/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1035/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1447/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/172//rebuild

review: Needs Fixing (continuous-integration)

[Eric Chen (eric-chen)]

Use charm/2.x/stable is a temp solution. Please add some comment there.

review: Needs Fixing

[Erhan Sunar (esunar)]

> Use charm/2.x/stable is a temp solution. Please add some comment there.

comment added

[Erhan Sunar (esunar)]

> See inline comment please.

ch:~containers/easyrsa was working however I changed in any case

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:dd86d89dc41b72e39a41f18b998962e9e74bd998
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/173/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1038/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1450/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/173//rebuild

review: Needs Fixing (continuous-integration)

[Eric Chen (eric-chen)]

As discussed offline, the functional test will fail in serverstack but success locally.
I'll merge it first but please submit bug to follow up it. Thanks!

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 513f4499e86bc4bc06dcbd43c57280200de5ebb9

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:dd86d89dc41b72e39a41f18b998962e9e74bd998
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/174/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1048/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1459/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/174//rebuild

review: Needs Fixing (continuous-integration)

diff --git a/.gitignore b/.gitignore
index 7917e99..da16155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ dist/
 # Builds
 .build/
 *.charm
+
+#vscode
+.history
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 7d9c002..7d9325f 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -3,18 +3,24 @@ parts:
   charm:
     source: src
     plugin: reactive
-    build-snaps: [charm]
+    #temporary solution for charm 3.x incompability/bug
+    build-snaps: 
+      - charm/2.x/stable
 bases:
     - build-on:
         - name: ubuntu
-          channel: "20.04"
+          channel: "22.04"
           architectures: ["amd64"]
       run-on:
         - name: ubuntu
+          channel: "22.04"
+          architectures:
+              - amd64
+        - name: ubuntu
           channel: "20.04"
           architectures:
               - amd64
         - name: ubuntu
           channel: "18.04"
           architectures:
-              - amd64
+              - amd64
\ No newline at end of file
diff --git a/src/metadata.yaml b/src/metadata.yaml
index c7dd0fe..b85d7c7 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -4,9 +4,7 @@ maintainer: Llama (LMA) Charmers <[e-mail]>
 description: >
   Installs the Graylog log management system. Connections to elasticsearch and
   mongodb are required for a fully functioning system. https://www.graylog.org/
-series:
-  - bionic
-  - focal
+series: []
 tags:
   - misc
 subordinate: false
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml b/src/tests/functional/tests/bundles/base-graylog-tls.yaml
similarity index 81%
rename from src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml
rename to src/tests/functional/tests/bundles/base-graylog-tls.yaml
index f358c09..b7f3eb8 100644
--- a/src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml
+++ b/src/tests/functional/tests/bundles/base-graylog-tls.yaml
@@ -1,32 +1,27 @@
-series: bionic
-
 applications:
   filebeat:
-    charm: cs:filebeat
+    charm: ch:filebeat
     num_units: 0
 
   graylog:
     num_units: 1
-    series: bionic
     options:
       channel: 3/stable
-
   elastic:
-    charm: cs:elasticsearch
-    channel: edge
+    charm: ch:elasticsearch
     num_units: 1
     options:
       es-heap-size: 1
 
   mongo:
-    charm: cs:mongodb
+    charm: ch:mongodb
     num_units: 1
 
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
 
   easyrsa:
-    charm: cs:~containers/easyrsa
+    charm: ch:containers-easyrsa
     num_units: 1
 
 relations:
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3.yaml b/src/tests/functional/tests/bundles/base-graylog.yaml
similarity index 81%
rename from src/tests/functional/tests/bundles/bionic-graylog3.yaml
rename to src/tests/functional/tests/bundles/base-graylog.yaml
index a20872f..32ee0d1 100644
--- a/src/tests/functional/tests/bundles/bionic-graylog3.yaml
+++ b/src/tests/functional/tests/bundles/base-graylog.yaml
@@ -1,33 +1,29 @@
-series: bionic
-
 applications:
   filebeat:
-    charm: cs:filebeat
+    charm: ch:filebeat
     num_units: 0
-  
+
   graylog:
     num_units: 1
-    series: bionic
     options:
       channel: 3/stable
-  
+
   elastic:
-    charm: cs:elasticsearch
-    channel: edge
+    charm: ch:elasticsearch
     num_units: 1
     options:
       es-heap-size: 1
-  
+
   mongo:
-    charm: cs:mongodb
+    charm: ch:mongodb
     num_units: 1
 
   haproxy:
-    charm: cs:haproxy
+    charm: ch:haproxy
     num_units: 1
 
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
 
 relations:
   - - haproxy
diff --git a/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml b/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml b/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml
deleted file mode 100644
index 28034db..0000000
--- a/src/tests/functional/tests/bundles/bionic-graylog2-ha.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 3
-    series: bionic
-    options:
-      channel: 2/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/bionic-graylog2.yaml b/src/tests/functional/tests/bundles/bionic-graylog2.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-graylog2.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-graylog2.yaml b/src/tests/functional/tests/bundles/bionic-graylog2.yaml
deleted file mode 100644
index a7dc962..0000000
--- a/src/tests/functional/tests/bundles/bionic-graylog2.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 1
-    series: bionic
-    options:
-      channel: 2/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml b/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml b/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml
deleted file mode 100644
index 28c63b1..0000000
--- a/src/tests/functional/tests/bundles/bionic-graylog3-ha.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 3
-    series: bionic
-    options:
-      channel: 3/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml b/src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml
new file mode 120000
index 0000000..bd0203c
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-graylog3-tls.yaml
@@ -0,0 +1 @@
+base-graylog-tls.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-graylog3.yaml b/src/tests/functional/tests/bundles/bionic-graylog3.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-graylog3.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-ha.yaml b/src/tests/functional/tests/bundles/bionic-ha.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic-ha.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-ha.yaml b/src/tests/functional/tests/bundles/bionic-ha.yaml
deleted file mode 100644
index 2d32dfc..0000000
--- a/src/tests/functional/tests/bundles/bionic-ha.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-# NOTE: Not in use yet.
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-  
-  graylog:
-    num_units: 3
-    series: bionic
-    options:
-      channel: 3/stable
-  
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-  
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/focal-graylog2.yaml b/src/tests/functional/tests/bundles/focal-graylog2.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/focal-graylog2.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal-graylog2.yaml b/src/tests/functional/tests/bundles/focal-graylog2.yaml
deleted file mode 100644
index 17a59cc..0000000
--- a/src/tests/functional/tests/bundles/focal-graylog2.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 1
-    series: focal
-    options:
-      channel: 2/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml b/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml
new file mode 120000
index 0000000..bd0203c
--- /dev/null
+++ b/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml
@@ -0,0 +1 @@
+base-graylog-tls.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml b/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml
deleted file mode 100644
index 1818dfc..0000000
--- a/src/tests/functional/tests/bundles/focal-graylog3-tls.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 1
-    series: focal
-    options:
-      channel: 3/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-  easyrsa:
-    charm: cs:~containers/easyrsa
-    num_units: 1
-
-relations:
-  - - mongo
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog
-    - nrpe
-  - - easyrsa:client
-    - graylog:certificates
diff --git a/src/tests/functional/tests/bundles/focal-graylog3.yaml b/src/tests/functional/tests/bundles/focal-graylog3.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/focal-graylog3.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal-graylog3.yaml b/src/tests/functional/tests/bundles/focal-graylog3.yaml
deleted file mode 100644
index 57d03cd..0000000
--- a/src/tests/functional/tests/bundles/focal-graylog3.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-series: bionic
-
-applications:
-  filebeat:
-    charm: cs:filebeat
-    num_units: 0
-
-  graylog:
-    num_units: 1
-    series: focal
-    options:
-      channel: 3/stable
-
-  elastic:
-    charm: cs:elasticsearch
-    channel: edge
-    num_units: 1
-    options:
-      es-heap-size: 1
-
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
-
-  haproxy:
-    charm: cs:haproxy
-    num_units: 1
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - haproxy
-    - filebeat
-  - - graylog:beats
-    - filebeat:logstash
-  - - graylog
-    - mongo
-  - - graylog
-    - elastic
-  - - graylog:website
-    - haproxy:reverseproxy
-  - - graylog
-    - nrpe
diff --git a/src/tests/functional/tests/bundles/jammy-graylog3-tls.yaml b/src/tests/functional/tests/bundles/jammy-graylog3-tls.yaml
new file mode 120000
index 0000000..bd0203c
--- /dev/null
+++ b/src/tests/functional/tests/bundles/jammy-graylog3-tls.yaml
@@ -0,0 +1 @@
+base-graylog-tls.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/jammy-graylog3.yaml b/src/tests/functional/tests/bundles/jammy-graylog3.yaml
new file mode 120000
index 0000000..751dc56
--- /dev/null
+++ b/src/tests/functional/tests/bundles/jammy-graylog3.yaml
@@ -0,0 +1 @@
+base-graylog.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-graylog2-ha.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-graylog2-ha.yaml.j2
new file mode 100644
index 0000000..9bbb020
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-graylog2-ha.yaml.j2
@@ -0,0 +1,7 @@
+series: bionic
+
+applications:
+  graylog:
+    num_units: 3
+    options:
+      channel: 2/stable
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-graylog2.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-graylog2.yaml.j2
new file mode 100644
index 0000000..528d2fe
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-graylog2.yaml.j2
@@ -0,0 +1,6 @@
+series: bionic
+
+applications:
+  graylog:
+    options:
+      channel: 2/stable
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-graylog3-ha.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-graylog3-ha.yaml.j2
new file mode 100644
index 0000000..a922370
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-graylog3-ha.yaml.j2
@@ -0,0 +1,7 @@
+series: bionic
+
+applications:
+  graylog:
+    num_units: 3
+    options:
+      channel: 3/stable
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-graylog3-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-graylog3-tls.yaml.j2
new file mode 100644
index 0000000..65b2826
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-graylog3-tls.yaml.j2
@@ -0,0 +1 @@
+series: bionic
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-graylog3.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-graylog3.yaml.j2
new file mode 100644
index 0000000..65b2826
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-graylog3.yaml.j2
@@ -0,0 +1 @@
+series: bionic
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-ha.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-ha.yaml.j2
new file mode 100644
index 0000000..a922370
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic-ha.yaml.j2
@@ -0,0 +1,7 @@
+series: bionic
+
+applications:
+  graylog:
+    num_units: 3
+    options:
+      channel: 3/stable
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/focal-graylog2.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-graylog2.yaml.j2
new file mode 100644
index 0000000..84ced7c
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/focal-graylog2.yaml.j2
@@ -0,0 +1,6 @@
+series: focal
+
+applications:
+  graylog:
+    options:
+      channel: 2/stable
diff --git a/src/tests/functional/tests/bundles/overlays/focal-graylog3-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-graylog3-tls.yaml.j2
new file mode 120000
index 0000000..32e7e0e
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/focal-graylog3-tls.yaml.j2
@@ -0,0 +1 @@
+focal-graylog3.yaml.j2
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/focal-graylog3.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-graylog3.yaml.j2
new file mode 100644
index 0000000..1557e60
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/focal-graylog3.yaml.j2
@@ -0,0 +1,6 @@
+series: focal
+
+applications:
+  graylog:
+    options:
+      channel: 3/stable
diff --git a/src/tests/functional/tests/bundles/overlays/jammy-graylog3-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy-graylog3-tls.yaml.j2
new file mode 100644
index 0000000..02090c1
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/jammy-graylog3-tls.yaml.j2
@@ -0,0 +1,10 @@
+series: jammy
+applications:
+  elastic:
+    series: focal
+
+  mongo:
+    series: focal
+
+  easyrsa:
+    series: focal
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/jammy-graylog3.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy-graylog3.yaml.j2
new file mode 100644
index 0000000..72fbc37
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/jammy-graylog3.yaml.j2
@@ -0,0 +1,10 @@
+series: jammy
+applications:
+  elastic:
+    series: focal
+
+  mongo:
+    series: focal
+
+  haproxy:
+    series: focal
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index a537fdb..cc78015 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -1,17 +1,17 @@
 charm_name: graylog
 gate_bundles:
-  - gl3: bionic-graylog3
-  - gl3: focal-graylog3
+  - gl3: jammy-graylog3-tls  
+  - gl3: jammy-graylog3
   - gl3: focal-graylog3-tls
+  - gl3: focal-graylog3
+  - gl3: bionic-graylog3
+  - gl2: bionic-graylog2
 #  - gl2: bionic-graylog2-ha
 #  - gl3: bionic-graylog3-ha
 smoke_bundles:
-  - gl3: bionic-graylog3
+  - gl3: jammy-graylog3
 dev_bundles:
-  - gl2: bionic-graylog2
-  - gl3: bionic-graylog3
-  - gl3: bionic-graylog3-tls
-  - gl2: focal-graylog2
+  - gl3: jammy-graylog3-tls
 tests:
   - gl2:
       - tests.test_legacy.LegacyTests