storytold/terraform-aws-observability-accelerator
2
0
Fork 0
mirror of https://github.com/storytold/terraform-aws-observability-accelerator.git synced 2026-10-09 00:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Rodrigue Koffi
2022-08-30 10:47:21 +02:00
parent 680a42488c
commit c93e2cffc1
3 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locals.tf
-1
View File
@@ -13,7 +13,6 @@ data "aws_grafana_workspace" "this" {
workspace_id = var.managed_grafana_workspace_id workspace_id = var.managed_grafana_workspace_id
} }
locals { locals {
eks_oidc_issuer_url = replace(data.aws_eks_cluster.eks_cluster.identity[0].oidc[0].issuer, "https://", "") eks_oidc_issuer_url = replace(data.aws_eks_cluster.eks_cluster.identity[0].oidc[0].issuer, "https://", "")
eks_cluster_endpoint = data.aws_eks_cluster.eks_cluster.endpoint eks_cluster_endpoint = data.aws_eks_cluster.eks_cluster.endpoint
main.tf
-39
View File
@@ -18,7 +18,6 @@ resource "aws_prometheus_alert_manager_definition" "this" {
workspace_id = local.amp_ws_id workspace_id = local.amp_ws_id
# TODO: support custom alert manager config
definition = <<EOF definition = <<EOF
alertmanager_config: | alertmanager_config: |
route: route:
@@ -64,41 +63,3 @@ resource "grafana_data_source" "amp" {
resource "grafana_folder" "this" { resource "grafana_folder" "this" {
title = "Observability Accelerator Dashboards" title = "Observability Accelerator Dashboards"
} }
# module "java" {
# count = var.enable_java ? 1 : 0
# source = "./modules/workloads/java"
# addon_context = local.context
# amp_endpoint = local.amp_ws_endpoint
# amp_id = local.amp_ws_id
# amp_region = local.amp_ws_region
# enable_recording_rules = var.enable_java_recording_rules
# dashboards_folder_id = grafana_folder.this.id
# depends_on = [
# module.operator
# ]
# }
# module "infra" {
# count = var.enable_infra_metrics ? 1 : 0
# source = "./modules/workloads/kube-prometheus"
# addon_context = local.context
# amp_endpoint = local.amp_ws_endpoint
# amp_id = local.amp_ws_id
# amp_region = local.amp_ws_region
# config = var.infra_metrics_config
# dashboards_folder_id = grafana_folder.this.id
# depends_on = [
# module.operator
# ]
# }
modules/workloads/java/main.tf
+2 -2
View File
@@ -7,7 +7,7 @@ terraform {
required_providers { required_providers {
grafana = { grafana = {
source = "grafana/grafana" source = "grafana/grafana"
version = "1.25.0" version = "~> 1.25.0"
} }
} }
} }
@@ -16,7 +16,7 @@ data "aws_partition" "current" {}
# deploys collector # deploys collector
module "helm_addon" { module "helm_addon" {
source = "github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon"
helm_config = merge( helm_config = merge(