Merge pull request #28 from philips-labs/feature/remove-grafana

Remove Grafana

.github/workflows/documentation.yml

@@ -0,0 +1,25 @@
+name: Generate terraform docs
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.pull_request.head.ref }}
+
+    - name: Render terraform docs inside the README.md and push changes back to PR branch
+      uses: terraform-docs/[email protected]
+      with:
+        working-dir: .
+        output-file: README.md
+        output-method: inject
+        git-push: "true"

CHANGELOG.md

@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
+## v4.0.0
+- BREAKING: remove Grafana from module
+- NOTE: Before upgrade: `terraform state rm module.thanos.grafana_data_source.thanos`
+- NOTE: Before upgrade: `terraform destroy -target=module.thanos.module.grafana`
+
+
+## v3.0.1
+- Update variant to support discovering CF instances
+
 ## v3.0.0
 - Add [variant](https://github.com/philips-labs/variant) support
 - Rename cf_exporter_config to more generic cf_functional_account

examples/default/main.tf

@@ -4,11 +4,9 @@ module "thanos" {
   cf_org_name = "demo"
   cf_space_id = "test"
 
-  grafana_password = "password"
-
   cf_functional_account = {
     api_endpoint = var.cf_api_url
     username     = var.cf_username
     password     = var.cf_password
   }
-}
+}

examples/default/providers.tf

@@ -5,11 +5,6 @@ provider "cloudfoundry" {
   skip_ssl_validation = false
 }
 
-provider "grafana" {
-  url  = "http://foo"
-  auth = "admin:password"
-}
-
 provider "hsdp" {
   region = "us-east"
 }

examples/default/versions.tf

@@ -7,9 +7,5 @@ terraform {
       source  = "philips-software/hsdp"
       version = ">= 0.17.0"
     }
-    grafana = {
-      source  = "grafana/grafana"
-      version = ">= 1.11.0"
-    }
   }
 }

main.tf

@@ -4,7 +4,7 @@ locals {
 }
 
 resource "random_id" "id" {
-  byte_length = 8
+  byte_length = 4
 }
 
 resource "random_password" "password" {
@@ -35,7 +35,6 @@ resource "cloudfoundry_app" "thanos" {
     VARIANT_PROMETHEUS_CONFIG  = "/sidecars/etc/prometheus.yml"
     VARIANT_TENANTS            = join(",", var.tenants)
     VARIANT_RELOAD             = "true"
-    PG_EXPORTERS               = join(",", [module.grafana.grafana_database_metrics_endpoint])
   }, var.environment)
 
   dynamic "routes" {

outputs.tf

@@ -1,9 +1,5 @@
-locals {
-  grafana_endpoint = join("", module.grafana.*.grafana_endpoint)
-}
-
-output "cluster_id" {
-  description = "Cluster ID of Thanos deployment"
+output "postfix" {
+  description = "Cluster ID / Postfix of Thanos deployment"
   value       = local.postfix
 }
 
@@ -41,29 +37,3 @@ output "thanos_store_endpoint" {
   description = "Internal only URL of Thanos store deployment"
   value       = "${cloudfoundry_route.thanos_store_internal.endpoint}:9090"
 }
-
-output "grafana_app_id" {
-  description = "App id for Grafana"
-  value       = join("", module.grafana.*.grafana_id)
-}
-
-output "grafana_endpoint" {
-  description = "URL of Grafana deployment (optional)"
-  value       = var.grafana_public_endpoints ? local.grafana_endpoint : "${local.grafana_endpoint}:3000"
-}
-
-output "grafana_auth" {
-  description = "The Grafana auth token to use for e.g. configuring Grafana provider"
-  value       = local.grafana_auth
-  sensitive   = true
-}
-
-output "grafana_username" {
-  description = "The Grafana username"
-  value       = var.grafana_username
-}
-
-output "grafana_url" {
-  description = "The Grafana URL"
-  value       = local.grafana_url
-}

variables.tf

@@ -38,41 +38,12 @@ variable "thanos_public_endpoints" {
   default     = false
 }
 
-variable "grafana_username" {
-  description = "Grafana username"
-  type        = string
-  default     = "admin"
-}
-
-variable "grafana_password" {
-  description = "Grafana password"
-  type        = string
-}
-
-variable "grafana_image" {
-  description = "Image to use for Grafana"
-  default     = "grafana/grafana:8.0.4"
-  type        = string
-}
-
-variable "grafana_public_endpoints" {
-  description = "Make Grafana public endpoint"
-  type        = bool
-  default     = true
-}
-
 variable "environment" {
   type        = map(any)
   description = "Pass environment variable to the app"
   default     = {}
 }
 
-variable "grafana_environment" {
-  type        = map(any)
-  description = "Pass environment variable to Grafana"
-  default     = {}
-}
-
 variable "docker_username" {
   type        = string
   description = "Docker registry username"

terraform.tf → versions.tf

@@ -10,10 +10,6 @@ terraform {
       source  = "philips-software/hsdp"
       version = ">= 0.16.3"
     }
-    grafana = {
-      source  = "grafana/grafana"
-      version = ">= 1.11.0"
-    }
     random = {
       source  = "random"
       version = ">= 2.2.1"