Merge ~rgildein/charm-prometheus-grok-exporter:lp2009614 into charm-prometheus-grok-exporter:master

[Robert Gildein]

remove flag to be able connect multiple Grafana

Removing unnecessary flag so registration of dashboard is triggered
every time if new relation joined.
Dropped the Xenial series and providing a small fix for bundles in
functional tests. Added some things from the bs templates to make
the func test smoother.

[🤖 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:5d7f042b2b7a39c54552e130f0c3f15f17a53cef
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/7/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/105/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/1//rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:a6824101d3eb375b48c42ef0ba698cfe0ad12081
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/8/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/106/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/2//rebuild

review: Approve (continuous-integration)

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

Change successfully merged at revision 2e6d18f1808fe4a536e9c1a1ccedb536e27b8493

diff --git a/Makefile b/Makefile
index 5faf2db..24fa9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,42 @@
+# This is a template `Makefile` file for reactive charms
+# This file is managed by bootstack-charms-spec and should not be modified
+# within individual charm repos. https://launchpad.net/bootstack-charms-spec
+
 PYTHON := /usr/bin/python3
 
 PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
-ifndef CHARM_BUILD_DIR
-	CHARM_BUILD_DIR=${PROJECTPATH}/build
-endif
-ifndef CHARM_LAYERS_DIR
-	CHARM_LAYERS_DIR=${PROJECTPATH}/layers
-endif
-ifndef CHARM_INTERFACES_DIR
-	CHARM_INTERFACES_DIR=${PROJECTPATH}/interfaces
-endif
-ifdef CONTAINER
-	BUILD_ARGS="--destructive-mode"
-endif
+CHARM_BUILD_DIR:=${PROJECTPATH}.build
+CHARM_LAYERS_DIR:=${PROJECTPATH}/layers
+CHARM_INTERFACES_DIR:=${PROJECTPATH}/interfaces
+RELEASE_CHANNEL:=edge
 METADATA_FILE="src/metadata.yaml"
-CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E "^name:" | awk '{print $$2}')
+CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E '^name:' | awk '{print $$2}')
 
 help:
 	@echo "This project supports the following targets"
 	@echo ""
 	@echo " make help - show this text"
-	@echo " make clean - remove unneeded files"
-	@echo " make submodules - make sure that the submodules are up-to-date"
+	@echo " make dev-environment - setup the development environment"
+	@echo " make pre-commit - run pre-commit checks on all the files"
+	@echo " make submodules - initialize, fetch, and checkout any nested submodules"
 	@echo " make submodules-update - update submodules to latest changes on remote branch"
+	@echo " make clean - remove unneeded files and clean charmcraft environment"
 	@echo " make build - build the charm"
-	@echo " make release - run clean, submodules, and build targets"
-	@echo " make lint - run flake8 and black --check"
-	@echo " make black - run black and reformat files"
 	@echo " make proof - run charm proof"
+	@echo " make release - run clean, build, proof target and upload charm"
+	@echo " make lint - run lint checkers"
+	@echo " make reformat - run lint tools to auto format code"
 	@echo " make unittests - run the tests defined in the unittest subdirectory"
 	@echo " make functional - run the tests defined in the functional subdirectory"
-	@echo " make test - run lint, proof, unittests and functional targets"
+	@echo " make test - run lint, unittests and functional targets"
 	@echo ""
 
-clean:
-	@echo "Cleaning files"
-	@git clean -ffXd -e '!.idea'
-	@echo "Cleaning existing build"
-	@rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
-	@rm -rf ${CHARM_BUILD_DIR}/*
-	@charmcraft clean
+dev-environment:
+	@echo "Creating virtualenv with pre-commit installed"
+	@cd src && tox -r -e dev-environment
+
+pre-commit:
+	@cd src && tox -e pre-commit
 
 submodules:
 	@echo "Cloning submodules"
@@ -49,40 +46,48 @@ submodules-update:
 	@echo "Pulling latest updates for submodules"
 	@git submodule update --init --recursive --remote --merge
 
-build:
-	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
-	@-git rev-parse --abbrev-ref HEAD > ./src/repo-info
+clean:
+	@echo "Cleaning files"
+	@git clean -ffXd -e '!.idea' -e '!.vscode'
+	@echo "Cleaning existing build"
+	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@rm -rf ${PROJECTPATH}/${CHARM_NAME}*.charm
+	@echo "Cleaning charmcraft"
+	@charmcraft clean
+
+build: clean
+	@echo "Building charm"
 	@charmcraft -v pack ${BUILD_ARGS}
 	@bash -c ./rename.sh
+
+proof: build
+	@echo "Running charm proof"
 	@mkdir -p ${CHARM_BUILD_DIR}/${CHARM_NAME}
 	@unzip ${PROJECTPATH}/${CHARM_NAME}.charm -d ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@charm proof ${CHARM_BUILD_DIR}/${CHARM_NAME}
 
-release: clean build
-	@echo "Charm is built at ${PROJECTPATH}/${CHARM_NAME}.charm"
-	@charmcraft upload ${PROJECTPATH}/${CHARM_NAME}.charm --release edge
+release: proof
+	@echo "Releasing charm to ${RELEASE_CHANNEL} channel"
+	@charmcraft upload ${CHARM_NAME}.charm --release ${RELEASE_CHANNEL}
 
 lint:
 	@echo "Running lint checks"
 	@cd src && tox -e lint
 
-black:
-	@echo "Reformat files with black"
-	@cd src && tox -e black
-
-proof: build
-	@echo "Running charm proof"
-	@charm proof ${CHARM_BUILD_DIR}/${CHARM_NAME}
+reformat:
+	@echo "Reformat files with black and isort"
+	@cd src && tox -e reformat
 
 unittests:
 	@echo "Running unit tests"
-	@cd src && tox -e unit
+	@cd src && tox -e unit -- ${UNIT_ARGS}
 
 functional: build
-	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
-	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} CHARM_PROJECTPATH=${PROJECTPATH} tox -e func
+	@echo "Executing functional tests using built charm at ${PROJECTPATH}"
+	@cd src && CHARM_LOCATION=${PROJECTPATH} tox -e func -- ${FUNC_ARGS}
 
 test: lint proof unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
 
 # The targets below don't depend on a file
-.PHONY: help submodules submodules-update clean build release lint black proof unittests functional test
+.PHONY: help dev-environment pre-commit submodules submodules-update clean build lint reformat proof unittests functional
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 9c68524..13dc66a 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -3,7 +3,11 @@ parts:
   charm:
     source: src
     plugin: reactive
-    build-snaps: [charm]
+    # Using charm/3.x/stable will cause the charm unable to install on 18.04
+    # with the following error: "pip requires Python '>=3.7' but the running
+    # Python is 3.6.9". This is because charm/3.x/stable start using system
+    # installation of python instead of a python snap.
+    build-snaps: [charm/2.x/stable]
 bases:
     - build-on:
         - name: ubuntu
@@ -22,8 +26,3 @@ bases:
           channel: "18.04"
           architectures:
               - amd64
-        - name: ubuntu
-          channel: "16.04"
-          architectures:
-              - amd64
-
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 5edf588..8894eba 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -3,11 +3,9 @@ summary: Export Prometheus metrics from arbitrary unstructured log data.
 maintainer:  Llama (LMA) Charmers <[e-mail]>
 description: |
   Export Prometheus metrics from arbitrary unstructured log data.
-series:
-  - jammy
-  - focal
-  - bionic
-  - xenial
+# Series are needed here only because we use charm/2.x/stable, whose linter will fail
+# if it doesn't find series here. Bases in charmcraft.yaml are used instead of series.
+series: []
 tags:
   - monitoring
 subordinate: true
diff --git a/src/reactive/prometheus_grok_exporter.py b/src/reactive/prometheus_grok_exporter.py
index 0300d43..9417d37 100644
--- a/src/reactive/prometheus_grok_exporter.py
+++ b/src/reactive/prometheus_grok_exporter.py
@@ -83,7 +83,6 @@ def write_config():
         remove_state("grok-exporter.do-reconfig")
         remove_state("grok-exporter.prometheus_relation_configured")
         set_state("grok-exporter.do-restart")
-        set_state("grok-exporter.register-dashboards")
 
 
 @when("config.changed.snap_channel")
@@ -184,8 +183,8 @@ def remove_nrpe_check():
 
 @when(
     "leadership.is_leader",
+    "prometheus-client.available",
     "endpoint.dashboards.joined",
-    "grok-exporter.register-dashboards",
 )
 def register_grafana_dashboards():
     """Register grafana dashboards."""
@@ -194,4 +193,3 @@ def register_grafana_dashboards():
         grafana_endpoint=grafana_endpoint
     )
     prom_grok_exporter_helper.register_grafana_dashboards()
-    remove_state("grok-exporter.register-dashboards")
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index 7d00e04..9d2a9df 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1,2 +1,3 @@
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 requests<2.25.0
+python-openstackclient
diff --git a/src/tests/functional/tests/bundles/bionic-queens.yaml b/src/tests/functional/tests/bundles/bionic-queens.yaml
index 6811f92..4efafc2 100644
--- a/src/tests/functional/tests/bundles/bionic-queens.yaml
+++ b/src/tests/functional/tests/bundles/bionic-queens.yaml
@@ -21,21 +21,21 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '0'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '1'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:~openstack-charmers-next/neutron-api
     series: *series
     num_units: 1
     options:
@@ -45,23 +45,23 @@ applications:
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:~openstack-charmers-next/neutron-openvswitch
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:~openstack-charmers-next/neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -69,7 +69,7 @@ applications:
     to:
       - '5'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -77,7 +77,7 @@ applications:
     to:
       - '6'
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:~openstack-charmers-next/nova-compute
     num_units: 2
     options:
       config-flags: default_ephemeral_format=ext4
@@ -88,14 +88,14 @@ applications:
     to:
       - '7'
   prometheus:
-    charm: cs:prometheus2
+    charm: ch:prometheus2
     num_units: 1
     to:
       - '8'
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
   grafana:
-    charm: cs:grafana
+    charm: ch:grafana
     num_units: 1
     to:
       - '9'
diff --git a/src/tests/functional/tests/bundles/bionic-stein.yaml b/src/tests/functional/tests/bundles/bionic-stein.yaml
index d204089..355ceac 100644
--- a/src/tests/functional/tests/bundles/bionic-stein.yaml
+++ b/src/tests/functional/tests/bundles/bionic-stein.yaml
@@ -21,21 +21,21 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: ch:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '0'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '1'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:~openstack-charmers-next/neutron-api
     series: *series
     num_units: 1
     options:
@@ -45,23 +45,23 @@ applications:
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:~openstack-charmers-next/neutron-openvswitch
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:~openstack-charmers-next/neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -69,7 +69,7 @@ applications:
     to:
       - '5'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -77,7 +77,7 @@ applications:
     to:
       - '6'
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:~openstack-charmers-next/nova-compute
     num_units: 1
     options:
       config-flags: default_ephemeral_format=ext4
@@ -88,14 +88,14 @@ applications:
     to:
       - '7'
   prometheus:
-    charm: cs:prometheus2
+    charm: ch:prometheus2
     num_units: 1
     to:
       - '8'
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
   grafana:
-    charm: cs:grafana
+    charm: ch:grafana
     num_units: 1
     to:
       - '9'
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
index fdcf02a..9da0620 100644
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ b/src/tests/functional/tests/bundles/bionic.yaml
@@ -2,7 +2,7 @@ series: bionic
 
 applications:
   ubuntu:
-    charm: cs:ubuntu
+    charm: ch:ubuntu
     num_units: 1
   prometheus-grok-exporter:
     options:
@@ -16,12 +16,12 @@ applications:
           labels:
             program: '{{.program}}'
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
   prometheus:
-    charm: cs:prometheus2
+    charm: ch:prometheus2
     num_units: 1
   grafana:
-    charm: cs:grafana
+    charm: ch:grafana
     num_units: 1
 relations:
   - - ubuntu
diff --git a/src/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml
index a27b678..d825628 100644
--- a/src/tests/functional/tests/bundles/focal.yaml
+++ b/src/tests/functional/tests/bundles/focal.yaml
@@ -2,7 +2,7 @@ series: focal
 
 applications:
   ubuntu:
-    charm: cs:ubuntu
+    charm: ch:ubuntu
     num_units: 1
   prometheus-grok-exporter:
     options:
@@ -16,12 +16,12 @@ applications:
           labels:
             program: '{{.program}}'
   nrpe:
-    charm: cs:nrpe
+    charm: ch:nrpe
   prometheus:
-    charm: cs:prometheus2
+    charm: ch:prometheus2
     num_units: 1
   grafana:
-    charm: cs:grafana
+    charm: ch:grafana
     num_units: 1
 relations:
   - - ubuntu
diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
index b9c2595..45065bc 100644
--- a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   {{ charm_name }}:
-    charm: "{{ CHARM_PROJECTPATH }}/{{ charm_name }}.charm"
+    charm: "{{ CHARM_LOCATION }}/{{ charm_name }}.charm"
diff --git a/src/tests/functional/tests/bundles/xenial-queens.yaml b/src/tests/functional/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index e36026b..0000000
--- a/src/tests/functional/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,160 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-queens
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5: {}
-  6: {}
-  7:
-    constraints: "root-disk=20G mem=4G"
-  8: {}
-  9: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '1'
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    series: *series
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '2'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '7'
-  prometheus:
-    charm: cs:prometheus2
-    num_units: 1
-    to:
-      - '8'
-  nrpe:
-    charm: cs:nrpe
-  grafana:
-    charm: cs:grafana
-    num_units: 1
-    to:
-      - '9'
-relations:
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-  - - 'neutron-api:juju-info'
-    - 'prometheus-grok-exporter:juju-info'
-  - - 'nova-cloud-controller:juju-info'
-    - 'prometheus-grok-exporter:juju-info'
-  - - 'glance:juju-info'
-    - 'prometheus-grok-exporter:juju-info'
-  - - 'prometheus-grok-exporter:prometheus-client'
-    - 'prometheus:target'
-  - - 'nova-cloud-controller:juju-info'
-    - 'nrpe:general-info'
-  - - 'neutron-api:juju-info'
-    - 'nrpe:general-info'
-  - - 'glance:juju-info'
-    - 'nrpe:general-info'
-  - - 'prometheus-grok-exporter:nrpe-external-master'
-    - 'nrpe:nrpe-external-master'
-  - - 'prometheus-grok-exporter:dashboards'
-    - 'grafana:dashboards'
diff --git a/src/tests/functional/tests/bundles/xenial.yaml b/src/tests/functional/tests/bundles/xenial.yaml
deleted file mode 100644
index f626f28..0000000
--- a/src/tests/functional/tests/bundles/xenial.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-series: xenial
-
-applications:
-  ubuntu:
-    charm: cs:ubuntu
-    num_units: 1
-  prometheus-grok-exporter:
-    options:
-      global-paths: "/var/log/syslog"
-      metrics: |
-        metrics:
-        - type: counter
-          name: syslog_msgs_total
-          help: Total number of syslog msgs, by program (ie daemon)
-          match: '%{SYSLOGBASE}'
-          labels:
-            program: '{{.program}}'
-  nrpe:
-    charm: cs:nrpe
-  prometheus:
-    charm: cs:prometheus2
-    num_units: 1
-  grafana:
-    charm: cs:grafana
-    num_units: 1
-relations:
-  - - ubuntu
-    - prometheus-grok-exporter
-  - - ubuntu:juju-info
-    - nrpe:general-info
-  - - prometheus-grok-exporter:nrpe-external-master
-    - nrpe:nrpe-external-master
-  - - prometheus-grok-exporter:prometheus-client
-    - prometheus:target
-  - - prometheus-grok-exporter:dashboards
-    - grafana:dashboards
-
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 99b23ee..1bb8ddf 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -1,7 +1,5 @@
 charm_name: prometheus-grok-exporter
 gate_bundles:
-  - xenial
-  - xenial-queens
   - bionic
   - bionic-queens
   - bionic-stein
diff --git a/src/tox.ini b/src/tox.ini
index 0650cd0..08b29ea 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -10,7 +10,7 @@ setenv =
 passenv =
   HOME
   PATH
-  CHARM_BUILD_DIR
+  CHARM_*
   PYTEST_KEEP_MODEL
   PYTEST_CLOUD_NAME
   PYTEST_CLOUD_REGION
@@ -21,7 +21,7 @@ passenv =
   NO_PROXY
   SNAP_HTTP_PROXY
   SNAP_HTTPS_PROXY
-  CHARM_PROJECTPATH
+  OS_*
 
 [testenv:lint]
 commands =