Update exporters: migration to CharmHub
Also, added kafka_endpoint config to kafka exporter
Change-Id: I24459e33841da33455b6780a4de2c808ddf30d0b
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/mysqld-exporter/metadata.yaml b/installers/charm/mysqld-exporter/metadata.yaml
index 5720b96..7f6fb6e 100644
--- a/installers/charm/mysqld-exporter/metadata.yaml
+++ b/installers/charm/mysqld-exporter/metadata.yaml
@@ -19,7 +19,7 @@
# osm-charmers@lists.launchpad.net
##
-name: mysqld-exporter
+name: mysqld-exporter-k8s
summary: OSM Prometheus Mysql Exporter
description: |
A CAAS charm to deploy OSM's Prometheus Mysql Exporter.
@@ -38,7 +38,7 @@
image:
type: oci-image
description: Image of mysqld-exporter
- upstream-source: "bitnami/mysqld-exporter:latest"
+ upstream-source: "bitnami/mysqld-exporter:0.14.0"
provides:
prometheus-scrape:
interface: prometheus
diff --git a/installers/charm/mysqld-exporter/src/charm.py b/installers/charm/mysqld-exporter/src/charm.py
index 46588b9..153dbfd 100755
--- a/installers/charm/mysqld-exporter/src/charm.py
+++ b/installers/charm/mysqld-exporter/src/charm.py
@@ -209,7 +209,7 @@
config.image_pull_policy,
run_as_non_root=config.security_context,
)
- container_builder.add_port(name=self.app.name, port=PORT)
+ container_builder.add_port(name="exporter", port=PORT)
container_builder.add_http_readiness_probe(
path="/api/health",
port=PORT,
diff --git a/installers/charm/mysqld-exporter/tox.ini b/installers/charm/mysqld-exporter/tox.ini
index 8e3318a..4c7970d 100644
--- a/installers/charm/mysqld-exporter/tox.ini
+++ b/installers/charm/mysqld-exporter/tox.ini
@@ -99,7 +99,7 @@
charmcraft
sh
commands =
- charmcraft build
+ charmcraft pack
sh -c 'ubuntu_version=20.04; \
architectures="amd64-aarch64-arm64"; \
charm_name=`cat metadata.yaml | grep -E "^name: " | cut -f 2 -d " "`; \