Merge ~rgildein/charm-telegraf:update/bootstack-template into charm-telegraf:master

[Robert Gildein]

Update templates file from bootstack-charms-spec

- update rename.sh, Makefile, charmcraft.yaml, tox.ini and
  .pre-commit-config.yaml from bootstack-charms-spec
- clean requirements
- moved check of sudoers templates from lint to unit tests

Update templates file from bootstack-charms-spec

- update rename.sh, Makefile, charmcraft.yaml, tox.ini and
  .pre-commit-config.yaml from bootstack-charms-spec
- clean requirements
- moved check of sudoers templates from lint to unit tests

[Robert Gildein (rgildein)]

tested with scrip: https://pastebin.ubuntu.com/p/vQ96wzpJt4/
result from tests: https://pastebin.ubuntu.com/p/CJy93VVq7C/
  - tests for focal-postgres failed, so I tried to run
    `make functional FUNC_ARGS="--dev"` <==> run only focal-compute,
    but same result
  - those tested failed because unit is in "maintenance" state with
    "Installing python3-netifaces,python3-yaml,sysstat,telegraf" message
  - I do not think that this changes is responsible for that

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

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

[Eric Chen (eric-chen)]

review: Needs Fixing

[Tianqi Xiao (txiao)]

Overall LGTM. Just one small thing that I would need clarification of. Please see my inline command.

review: Needs Information

[Robert Gildein (rgildein)]

This is blocked / should not be merged before [1].

---
[1]: https://code.launchpad.net/~rgildein/bootstack-charms-spec/+git/bootstack-charms-spec/+merge/428203

[Robert Gildein (rgildein)]

result from new unit tests: https://pastebin.ubuntu.com/p/dXVz4Khwkv/
couple of tests are broken, but it's not related with my changes
https://bugs.launchpad.net/charm-telegraf/+bug/1987542

[Tianqi Xiao (txiao)]

review: Approve

[Eric Chen (eric-chen)]

review: Approve

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

Change successfully merged at revision 3202b0a91d6a3f13ce6946490be7b22d2887b90f

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..18d9070
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,22 @@
+# This is a template `.pre-commit-config.yaml` 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
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-added-large-files
+      - id: check-json
+      - id: check-yaml
+  - repo: local
+    hooks:
+      - id: lint
+        name: lint
+        entry: make lint
+        language: system
+        types: [ python ]
diff --git a/Makefile b/Makefile
index dd167dd..b35c74e 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 and proof target and upload charm to channel"
+	@echo " make lint - run flake8, black --check and isort --check"
+	@echo " make reformat - run black and isort and reformat files"
 	@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 ${CHARM_BUILD_DIR}/${CHARM_NAME}
-	@rm -rf ${PROJECTPATH}/${CHARM_NAME}*.charm
-	@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,39 +46,48 @@ submodules-update:
 	@echo "Pulling latest updates for submodules"
 	@git submodule update --init --recursive --remote --merge
 
-build: clean submodules-update
-	@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: build
-	@echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}"
+release: proof
+	@echo "Releasing charm to ${RELEASE_CHANNEL} channel"
+	@charmcraft upload nrpe.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_LOCATION=${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 faaf9a0..4988a80 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -1,24 +1,32 @@
+# Learn more about charmcraft.yaml configuration at:
+# https://juju.is/docs/sdk/charmcraft-config
+# This is a template `charmcraft.yaml` 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
+
 type: charm
+
 parts:
   charm:
     source: src
     plugin: reactive
-    build-snaps: [charm]
+    build-snaps: [ charm ]
+
 bases:
-    - build-on:
-        - name: ubuntu
-          channel: "20.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
+  - build-on:
+    - name: ubuntu
+      channel: "20.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
diff --git a/rename.sh b/rename.sh
index bc8697f..88e476f 100755
--- a/rename.sh
+++ b/rename.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# This is a template `rename.sh` 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
+
 charm=$(grep -E "^name:" src/metadata.yaml | awk '{print $2}')
 echo "renaming ${charm}_*.charm to ${charm}.charm"
 echo -n "pwd: "
diff --git a/src/hooks/apache-relation-changed b/src/hooks/apache-relation-changed
index 76907b4..f05785f 100755
--- a/src/hooks/apache-relation-changed
+++ b/src/hooks/apache-relation-changed
@@ -18,9 +18,11 @@
 
 # Load modules from $CHARM_DIR/lib
 import sys
+
 sys.path.append('lib')
 
 from charms.layer import basic
+
 basic.bootstrap_charm_deps()
 basic.init_config_states()
 
@@ -32,4 +34,5 @@ basic.init_config_states()
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
+
 main()
diff --git a/src/hooks/exec-relation-changed b/src/hooks/exec-relation-changed
index 76907b4..f05785f 100755
--- a/src/hooks/exec-relation-changed
+++ b/src/hooks/exec-relation-changed
@@ -18,9 +18,11 @@
 
 # Load modules from $CHARM_DIR/lib
 import sys
+
 sys.path.append('lib')
 
 from charms.layer import basic
+
 basic.bootstrap_charm_deps()
 basic.init_config_states()
 
@@ -32,4 +34,5 @@ basic.init_config_states()
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
+
 main()
diff --git a/src/hooks/haproxy-relation-changed b/src/hooks/haproxy-relation-changed
index 76907b4..f05785f 100755
--- a/src/hooks/haproxy-relation-changed
+++ b/src/hooks/haproxy-relation-changed
@@ -18,9 +18,11 @@
 
 # Load modules from $CHARM_DIR/lib
 import sys
+
 sys.path.append('lib')
 
 from charms.layer import basic
+
 basic.bootstrap_charm_deps()
 basic.init_config_states()
 
@@ -32,4 +34,5 @@ basic.init_config_states()
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
 from charms.reactive import main
+
 main()
diff --git a/src/hooks/relations/telegraf-exec/interface.yaml b/src/hooks/relations/telegraf-exec/interface.yaml
index 4a5a57f..a4fafe5 100644
--- a/src/hooks/relations/telegraf-exec/interface.yaml
+++ b/src/hooks/relations/telegraf-exec/interface.yaml
@@ -1,4 +1,4 @@
-name: telegraf-exec 
+name: telegraf-exec
 summary: Interface to configure exec plugin from a service
 version: 1
 repo: https://git.launchpad.net/~verterok/charms/+source/interface-telegraf-exec
diff --git a/src/icon.svg b/src/icon.svg
index 8f01af7..36d0a10 100644
--- a/src/icon.svg
+++ b/src/icon.svg
@@ -10,4 +10,4 @@
             <path d="M77.1614039,55.7822278 L71.8347455,32.5131414 C71.5543951,31.2515645 70.3629057,29.9899875 69.1013288,29.6395494 L44.640753,22.1401752 C44.290315,22.0700876 43.9398769,22 43.5894389,22 C42.5381248,22 41.416723,22.4205257 40.7859345,23.0513141 L23.2640321,39.3116395 C22.3528932,40.1526909 21.7921923,41.8347935 22.0725428,43.0963705 L27.7496391,67.9774718 C28.0299896,69.2390488 29.2214789,70.5006258 30.4830559,70.8510638 L53.3316166,77.8598248 C53.6820547,77.9299124 54.0324927,78 54.3829308,78 C55.4342449,78 56.5556467,77.5794743 57.1864351,76.9486859 L75.8998269,59.5669587 C76.951141,58.7259074 77.4417543,57.0438048 77.1614039,55.7822278 Z M47.163907,27.6070088 L63.9148457,32.7234043 C64.5456341,32.9336671 64.5456341,33.2140175 63.9148457,33.3541927 L55.0838069,35.3867334 C54.3829308,35.5269086 53.4717918,35.2465582 53.0512662,34.7559449 L46.8835565,28.097622 C46.3929433,27.6770964 46.5331185,27.4668335 47.163907,27.6070088 Z M57.6069608,57.6745932 C57.747136,58.3754693 57.3266104,58.7259074 56.6958219,58.5156446 L38.6132186,52.9787234 C37.9824301,52.7684606 37.8422549,52.2077597 38.3328682,51.787234 L52.2102149,38.8911139 C52.7008281,38.4005006 53.261529,38.6107635 53.4017042,39.2415519 L57.6069608,57.6745932 Z M27.8197268,41.2740926 L42.5381248,27.6070088 C43.028738,27.1163955 43.7997017,27.1864831 44.290315,27.6770964 L51.649514,35.5969962 C52.1401273,36.0876095 52.0700397,36.8585732 51.5794264,37.3491865 L36.8610284,51.0162703 C36.3704151,51.5068836 35.5994514,51.436796 35.1088381,50.9461827 L27.7496391,43.0262829 C27.3291135,42.5356696 27.3291135,41.7647059 27.8197268,41.2740926 Z M31.3941948,63.0012516 L27.4692887,45.9699625 C27.3291135,45.2690864 27.5393763,45.1989987 28.0299896,45.689612 L34.1976992,52.3479349 C34.6883125,52.8385482 34.8985753,53.8197747 34.6883125,54.4505632 L32.0249833,63.0713392 C31.8848081,63.6320401 31.5343701,63.6320401 31.3941948,63.0012516 Z M52.911091,72.8836045 L33.7771736,66.9962453 C33.1463851,66.7859825 32.7258594,66.0851064 32.9361223,65.4543179 L36.0900647,55.0813517 C36.3003275,54.4505632 37.0012036,54.0300375 37.6319921,54.2403004 L56.7659095,60.1276596 C57.396698,60.3379224 57.8172236,61.0387985 57.6069608,61.669587 L54.4530184,72.0425532 C54.2427555,72.7434293 53.5418795,73.0938673 52.911091,72.8836045 Z M69.9423801,58.9361702 L57.1163475,70.8510638 C56.6257343,71.3416771 56.3453838,71.1314143 56.5556467,70.5006258 L59.2189758,61.8798498 C59.4292386,61.2490613 60.1301147,60.5481852 60.8309908,60.40801 L69.6620296,58.3754693 C70.2928181,58.2352941 70.4329933,58.5156446 69.9423801,58.9361702 Z M71.3441323,56.4130163 L60.7609032,58.795995 C60.0600271,58.9361702 59.4292386,58.5156446 59.2890634,57.8848561 L54.8034564,38.330413 C54.6632812,37.6295369 55.0838069,36.9987484 55.7145953,36.8585732 L66.2978244,34.4755945 C66.9987005,34.3354193 67.629489,34.7559449 67.7696642,35.3867334 L72.2552712,54.9411765 C72.3954464,55.571965 71.9749208,56.2728411 71.3441323,56.4130163 Z" id="symbol_2_" fill="#FFFFFF"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/pyproject.toml b/src/pyproject.toml
new file mode 100644
index 0000000..7ae7f41
--- /dev/null
+++ b/src/pyproject.toml
@@ -0,0 +1,35 @@
+# This is a template `pyproject.toml` 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
+
+[tool.flake8]
+ignore = ["D100", "D101", "D102", "D103"]
+exclude = ['.eggs', '.git', '.tox', '.venv', '.build', 'report']
+max-line-length = 88
+max-complexity = 10
+
+[tool.black]
+line-length = 88
+exclude = '''
+/(
+    | .eggs
+    | .git
+    | .tox
+    | .venv
+    | .build
+    | report
+)/
+'''
+
+[tool.isort]
+profile = "black"
+skip_glob = '''
+/(
+    | .eggs
+    | .git
+    | .tox
+    | .venv
+    | .build
+    | report
+)/
+'''
diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index 5548956..61aabcf 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -30,13 +30,14 @@ import sys
 import time
 from distutils.version import LooseVersion
 
+import charms.promreg
+import netifaces
+import yaml
 from charmhelpers import context, fetch
 from charmhelpers.contrib.charmsupport import nrpe
 from charmhelpers.core import hookenv, host, kernel, unitdata
 from charmhelpers.core.host import is_container
 from charmhelpers.core.templating import render
-
-import charms.promreg
 from charms import apt
 from charms.layer import snap
 from charms.reactive import (
@@ -50,15 +51,9 @@ from charms.reactive import (
     when_not,
 )
 from charms.reactive.bus import get_states
-
-from files.telegraf_exec_metrics import METRICS
-
 from jinja2 import Environment, FileSystemLoader, Template, exceptions
 
-import netifaces
-
-import yaml
-
+from files.telegraf_exec_metrics import METRICS
 
 DEB_BASE_DIR = "/etc/telegraf"
 SNAP_BASE_DIR = "/var/snap/telegraf/current"
diff --git a/src/templates/apache-server-status.tmpl b/src/templates/apache-server-status.tmpl
index 18f8871..38e027c 100644
--- a/src/templates/apache-server-status.tmpl
+++ b/src/templates/apache-server-status.tmpl
@@ -13,4 +13,3 @@
         Allow from localhost
     </Location>
 </VirtualHost>
-
diff --git a/src/templates/influxdb-api.conf.tmpl b/src/templates/influxdb-api.conf.tmpl
index 9d76988..0466afe 100644
--- a/src/templates/influxdb-api.conf.tmpl
+++ b/src/templates/influxdb-api.conf.tmpl
@@ -4,7 +4,7 @@
   # Multiple urls can be specified but it is assumed that they are part of the same
   # cluster, this means that only ONE of the urls will be written to each interval.
   # urls = ["udp://localhost:8089"] # UDP endpoint example
-  urls = {{ urls }} 
+  urls = {{ urls }}
   # The target database for metrics (telegraf will create it if not exists)
   database = "telegraf" # required
   # Precision of writes, valid values are n, u, ms, s, m, and h
@@ -20,4 +20,3 @@
   user_agent = "telegraf"
   # Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
   # udp_payload = 512
-
diff --git a/src/templates/sudoers/telegraf_intel_rdt.tmpl b/src/templates/sudoers/telegraf_intel_rdt.tmpl
index 0324a77..fb8edfd 100644
--- a/src/templates/sudoers/telegraf_intel_rdt.tmpl
+++ b/src/templates/sudoers/telegraf_intel_rdt.tmpl
@@ -1,4 +1,3 @@
 Cmnd_Alias PQOS = /usr/sbin/pqos -r --iface-os --mon-file-type=csv --mon-interval=*
 {{ telegraf_user }} ALL=(root) NOPASSWD: PQOS
 Defaults!PQOS !logfile, !syslog, !pam_session
-
diff --git a/src/templates/sudoers/telegraf_ipmi.tmpl b/src/templates/sudoers/telegraf_ipmi.tmpl
index 463a608..14e2076 100644
--- a/src/templates/sudoers/telegraf_ipmi.tmpl
+++ b/src/templates/sudoers/telegraf_ipmi.tmpl
@@ -1,4 +1,3 @@
 Cmnd_Alias IPMITOOL = /usr/bin/ipmitool sdr elist
 {{ telegraf_user }}  ALL=(root) NOPASSWD: IPMITOOL
 Defaults!IPMITOOL !logfile, !syslog, !pam_session
-
diff --git a/src/templates/sudoers/telegraf_iptables.tmpl b/src/templates/sudoers/telegraf_iptables.tmpl
index 49354db..8e5f67d 100644
--- a/src/templates/sudoers/telegraf_iptables.tmpl
+++ b/src/templates/sudoers/telegraf_iptables.tmpl
@@ -1,4 +1,3 @@
 Cmnd_Alias IPTABLESSHOW = /sbin/iptables -w 5 -nvL *
 {{ telegraf_user }}  ALL=(root) NOPASSWD: IPTABLESSHOW
 Defaults!IPTABLESSHOW !logfile, !syslog, !pam_session
-
diff --git a/src/templates/sudoers/telegraf_ovs.tmpl b/src/templates/sudoers/telegraf_ovs.tmpl
index 27087b4..f53f1b7 100644
--- a/src/templates/sudoers/telegraf_ovs.tmpl
+++ b/src/templates/sudoers/telegraf_ovs.tmpl
@@ -8,4 +8,3 @@ Cmnd_Alias OVSAPPCTL = /usr/bin/ovs-appctl
 Defaults!OVSOFCTL !logfile, !syslog, !pam_session
 Defaults!OVSVSCTL !logfile, !syslog, !pam_session
 Defaults!OVSAPPCTL !logfile, !syslog, !pam_session
-
diff --git a/src/templates/sudoers/telegraf_smart.tmpl b/src/templates/sudoers/telegraf_smart.tmpl
index 1ceaf74..1f8d88c 100644
--- a/src/templates/sudoers/telegraf_smart.tmpl
+++ b/src/templates/sudoers/telegraf_smart.tmpl
@@ -5,4 +5,3 @@ Defaults!SMARTCTL !logfile, !syslog, !pam_session
 Cmnd_Alias NVME = /usr/sbin/nvme
 {{ telegraf_user }}  ALL=(root) NOPASSWD: NVME
 Defaults!NVME !logfile, !syslog, !pam_session
-
diff --git a/src/templates/telegraf.conf.tmpl b/src/templates/telegraf.conf.tmpl
index 966b4a9..fe64b76 100644
--- a/src/templates/telegraf.conf.tmpl
+++ b/src/templates/telegraf.conf.tmpl
@@ -46,7 +46,7 @@
 
   # Telegraf will cache metric_buffer_limit metrics for each output, and will
   # flush this buffer on a successful write.
-  metric_buffer_limit = {{ metric_buffer_limit }} 
+  metric_buffer_limit = {{ metric_buffer_limit }}
 
   # Collection jitter is used to jitter the collection by a random amount.
   # Each plugin will sleep for a random time within jitter before collecting.
@@ -63,9 +63,9 @@
   flush_jitter = "{{ flush_jitter }}"
 
   # Run telegraf in debug mode
-  debug = {% if debug %}true{% else %}false{% endif %} 
+  debug = {% if debug %}true{% else %}false{% endif %}
   # Run telegraf in quiet mode
-  quiet = {% if quiet %}true{% else %}false{% endif %} 
+  quiet = {% if quiet %}true{% else %}false{% endif %}
   # Override default hostname, if empty use os.Hostname()
   hostname = "{{ hostname }}"
 
diff --git a/src/tests/functional/tests/base.py b/src/tests/functional/tests/base.py
index 5f097ca..30d5667 100644
--- a/src/tests/functional/tests/base.py
+++ b/src/tests/functional/tests/base.py
@@ -5,11 +5,9 @@ import time
 import unittest
 
 import requests
-
 from zaza import model
 from zaza.utilities import juju
 
-
 DEFAULT_HTTPGET_TIMEOUT = 10
 DEFAULT_RETRIES = 12
 DEFAULT_RETRIES_TIMEOUT = 5
diff --git a/src/tests/functional/tests/test_telegraf.py b/src/tests/functional/tests/test_telegraf.py
index 44e46e6..4ba7202 100644
--- a/src/tests/functional/tests/test_telegraf.py
+++ b/src/tests/functional/tests/test_telegraf.py
@@ -16,7 +16,6 @@
 import logging
 
 from tenacity import retry, stop_after_attempt, wait_fixed
-
 from zaza import model
 
 from .base import BaseTelegrafTest
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index a2265ab..7bc01f7 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -33,4 +33,3 @@ tests:
       - tests.test_telegraf.TestTelegraf
   - compute:
       - tests.test_compute.TestTelegrafCompute
-
diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt
index eddbac0..49e57e1 100644
--- a/src/tests/unit/requirements.txt
+++ b/src/tests/unit/requirements.txt
@@ -1,12 +1,3 @@
-coverage
-flake8
-pytest
-pytest-cov
 pytest-mock
-pytest-xdist
 netifaces
-insights-core
-charms.reactive>=1.3.0
-requests
-pbr
-urllib3
+jinja2
diff --git a/src/tests/unit/test_telegraf.py b/src/tests/unit/test_telegraf.py
index 43ffbd0..7f409e4 100644
--- a/src/tests/unit/test_telegraf.py
+++ b/src/tests/unit/test_telegraf.py
@@ -28,21 +28,17 @@ from textwrap import dedent
 from unittest import mock
 from unittest.mock import MagicMock, call, patch
 
+import charms
+import py
+import pytest
+import yaml
 from charmhelpers import fetch
 from charmhelpers.core import host, kernel
 from charmhelpers.core.hookenv import Config
 from charmhelpers.core.templating import render
 from charmhelpers.fetch import apt_pkg
-
-import charms
 from charms.reactive import RelationBase, bus, helpers, set_flag
 
-import py
-
-import pytest
-
-import yaml
-
 # Mock layer modules
 apt = MagicMock()
 layer = MagicMock()
diff --git a/src/tests/lint/render_sudoers.py b/src/tests/unit/test_templates_sudoers.py
similarity index 50%
rename from src/tests/lint/render_sudoers.py
rename to src/tests/unit/test_templates_sudoers.py
index 4005ce1..8e50262 100644
--- a/src/tests/lint/render_sudoers.py
+++ b/src/tests/unit/test_templates_sudoers.py
@@ -1,12 +1,17 @@
 import os
+import subprocess
+import tempfile
 
 from jinja2 import Environment, FileSystemLoader
 
-template_dir = os.path.join("templates/sudoers")
-for template in os.listdir(template_dir):
-    environment = Environment(loader=FileSystemLoader(template_dir))
-    template = environment.get_template(template)
-    # A simple print(telegraf_user="test-user") would append a newline.
-    # We want to detect if the rendered template lacks a trailing
-    # newline, as it would break sudo when deployed. Hence end=''.
-    print(template.render(telegraf_user="test-user"), end="")
+
+def test_sudoers_templates():
+    template_dir = os.path.join("templates/sudoers")
+    for template in os.listdir(template_dir):
+        environment = Environment(loader=FileSystemLoader(template_dir))
+        template = environment.get_template(template)
+        with tempfile.NamedTemporaryFile(mode="w") as tmp:
+            tmp.write(template.render(telegraf_user="test-user"))
+            tmp.flush()
+            # check the templates with visudo check-only mode
+            subprocess.check_call(["visudo", "-csf", tmp.name])
diff --git a/src/tox.ini b/src/tox.ini
index 4b7128f..d371a80 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -1,6 +1,9 @@
+# This is a template `tox.ini` 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
+
 [tox]
 skipsdist=True
-skip_missing_interpreters = True
 envlist = lint, unit, func
 
 [testenv]
@@ -21,68 +24,65 @@ passenv =
   NO_PROXY
   SNAP_HTTP_PROXY
   SNAP_HTTPS_PROXY
-  OS_REGION_NAME
-  OS_AUTH_VERSION
-  OS_AUTH_URL
-  OS_PROJECT_DOMAIN_NAME
-  OS_USERNAME
-  OS_PASSWORD
-  OS_PROJECT_ID
-  OS_USER_DOMAIN_NAME
-  OS_PROJECT_NAME
-  OS_IDENTITY_API_VERSION
+  OS_*
+
+[testenv:dev-environment]
+envdir = {toxinidir}/.venv
+deps =
+  pre-commit
+  {[testenv:lint]deps}
+  {[testenv:unit]deps}
+  {[testenv:func]deps}
+
+[testenv:pre-commit]
+envdir = {[testenv:dev-environment]envdir}
+deps = {[testenv:dev-environment]deps}  # ensure that dev-environment is installed
+commands = pre-commit run --all-files
 
 [testenv:lint]
 commands =
-    flake8
-    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
-    bash -c "python3 tests/lint/render_sudoers.py | visudo -csf -"
+    pflake8
+    black --check --diff --color .
+    isort --check --diff --color .
+whitelist_externals = bash
 deps =
     black
-    flake8
-    flake8-colors
+    # NOTE(rgildein): It is necessary to limit flake8 with version 5.0.0, due
+    # to the problem https://github.com/csachs/pyproject-flake8/issues/13.
+    flake8 < 5.0.0
+    pyproject-flake8
     flake8-docstrings
-    flake8-import-order
-    jinja2
     pep8-naming
-whitelist_externals = bash
-
-[flake8]
-exclude =
-    .git,
-    __pycache__,
-    .tox,
-    charmhelpers,
-    mod,
-    .build
-#ignore = I100, D101, D102, D103, I201, D205, W504, D400, D401, D403, D209, D100, E403, I101, E501, N803, E226, E128, D200, E741, D202, E261, E402, D104, W503, E231  # TODO
-ignore = D100, D101, D102, D103
-
-max-line-length = 88
-max-complexity = 10
+    flake8-colors
+    colorama
+    isort
 
-[testenv:black]
+[testenv:reformat]
+envdir = {toxworkdir}/lint
 commands =
-    black --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
-deps =
-    black
+    black .
+    isort .
+deps = {[testenv:lint]deps}
 
 [testenv:unit]
-commands =
-  pytest {posargs:-vvv -s -n auto --ignore {toxinidir}/tests/functional \
-           --cov=lib \
+commands = pytest {toxinidir}/tests/unit \
+  {posargs:-v \
            --cov=reactive \
            --cov=actions \
            --cov=hooks \
-           --cov=src \
+           --cov=files \
+           --cov=lib \
            --cov-report=term \
-           --cov-report=annotate:report/annotated \
            --cov-report=html:report/html}
-deps = -r{toxinidir}/tests/unit/requirements.txt
+deps =
+    -r {toxinidir}/requirements.txt
+    -r {toxinidir}/tests/unit/requirements.txt
+    pytest
+    pytest-cov
 
 [testenv:func]
 changedir = {toxinidir}/tests/functional
 commands = functest-run-suite {posargs:--keep-faulty-model}
 deps =
-  git+https://github.com/openstack-charmers/zaza.git#egg=zaza
   -r {toxinidir}/tests/functional/requirements.txt
+  git+https://github.com/openstack-charmers/zaza.git#egg=zaza