Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Jul 30, 2024
1 parent c6fc642 commit 69fa1aa
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# tfmod-prometheus

# CHANGELOG
* 0.0.2 -- 2024-07-30
-

* 0.0.1 -- 2024-07-22
- add force_delete and lifecycle policies to copy_images
Expand Down
16 changes: 8 additions & 8 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ resource "helm_release" "prometheus" {

# Prometheus chart:
set {
name = "configmapReload.prometheus.image.repository"
name = "configmapReload.prometheus.image.repository"
value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
}
set {
name = "configmapReload.prometheus.image.tag"
value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[1]
}
set {
name = "server.image.repository"
name = "server.image.repository"
value = split(":", module.images.images[local.prom_key].dest_full_path)[0]
}
set {
Expand All @@ -74,15 +74,15 @@ resource "helm_release" "prometheus" {

# alertmanager subchart:
set {
name = "alertmanager.image.repository"
name = "alertmanager.image.repository"
value = split(":", module.images.images[local.alertman_key].dest_full_path)[0]
}
set {
name = "alertmanager.image.tag"
value = module.images.images[local.alertman_key].tag
}
set {
name = "alertmanager.configmapReload.image.repository"
name = "alertmanager.configmapReload.image.repository"
value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
}
set {
Expand All @@ -96,11 +96,11 @@ resource "helm_release" "prometheus" {

# kube-state-metrics subchart:
set {
name = "kube-state-metrics.image.registry"
name = "kube-state-metrics.image.registry"
value = module.images.images[local.ksm_key].dest_registry
}
set {
name = "kube-state-metrics.image.repository"
name = "kube-state-metrics.image.repository"
value = module.images.images[local.ksm_key].dest_repository
}
set {
Expand All @@ -115,7 +115,7 @@ resource "helm_release" "prometheus" {
}
set {
name = "prometheus-node-exporter.image.repository"
value = module.images.images[local.node_exporter_key].dest_repository
value = module.images.images[local.node_exporter_key].dest_repository
}
set {
name = "prometheus-node-exporter.image.tag"
Expand All @@ -124,7 +124,7 @@ resource "helm_release" "prometheus" {

# prometheus-pushgateway
set {
name = "prometheus-pushgateway.image.repository"
name = "prometheus-pushgateway.image.repository"
value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0]
}
set {
Expand Down
13 changes: 13 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,16 @@ output "prometheus_server_internal_endpoint" {
}
}

################################################################################
# Module information
################################################################################

output "module_name" {
description = "The name of this module."
value = local._module_name
}

output "module_version" {
description = "The version of this module."
value = local._module_version
}
3 changes: 1 addition & 2 deletions version.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
locals {
_module_name = "tfmod-prometheus"
_module_version = "0.0.1"
_module_providers = ["helm", "kubernetes"]
_module_version = "0.0.2"
}

0 comments on commit 69fa1aa

Please sign in to comment.