add more parameters for OKTA

Author: uchinda-sph

main.tf

@@ -2,12 +2,19 @@ locals {
   values = {
     prometheus_image_repository = var.prometheus_image_repository
     prometheus_image_tag        = var.prometheus_image_tag
+    prometheus_host_url         = var.prometheus_host_url
+
+    grafana_image_repository = var.grafana_image_repository
+    grafana_image_tag        = var.grafana_image_tag
+    grafana_admin_password   = var.grafana_admin_password
+    grafana_host_url         = var.grafana_host_url
+    grafana_server_root_url  = var.grafana_server_root_url
 
-    grafana_image_repository   = var.grafana_image_repository
-    grafana_image_tag          = var.grafana_image_tag
-    grafana_admin_password     = var.grafana_admin_password
     grafana_okta_client_id     = var.grafana_okta_client_id
     grafana_okta_client_secret = var.grafana_okta_client_secret
+    grafana_okta_auth_url      = var.grafana_okta_auth_url
+    grafana_okta_token_url     = var.grafana_okta_token_url
+    grafana_okta_api_url       = var.grafana_okta_api_url
 
     prometheus_operator_image_repository = var.prometheus_operator_image_repository
     prometheus_operator_image_tag        = var.prometheus_operator_image_tag

templates/values.yaml

@@ -738,7 +738,7 @@ grafana:
     # hosts:
     #   - grafana.domain.com
     hosts:
-      - bt-dev.grafana.platform.sphdigital.com
+      - ${grafana_host_url}
 
     ## Path for grafana ingress
     path: /
@@ -755,7 +755,7 @@ grafana:
     log:
       level: debug
     server:
-      root_url: https://bt-dev.grafana.platform.sphdigital.com
+      root_url: ${grafana_server_root_url}
     auth.okta:
       name: Okta
       icon: okta
@@ -764,9 +764,9 @@ grafana:
       client_id: ${grafana_okta_client_id}
       client_secret: ${grafana_okta_client_secret}
       scopes: openid profile email groups
-      auth_url: https://sphmedia.okta.com/oauth2/v1/authorize
-      token_url: https://sphmedia.okta.com/oauth2/v1/token
-      api_url: https://sphmedia.okta.com/oauth2/v1/userinfo
+      auth_url: ${grafana_okta_auth_url}
+      token_url: ${grafana_okta_token_url}
+      api_url: ${grafana_okta_api_url}
       # allowed_domains:
       # allowed_groups:
       # role_attribute_path:
@@ -2106,7 +2106,7 @@ prometheus:
     # hosts:
     #   - prometheus.domain.com
     hosts:
-      - bt-dev.prometheus.platform.sphdigital.com
+      - ${prometheus_host_url}
 
     ## Paths to use for ingress rules - one path should match the prometheusSpec.routePrefix
     ##

variables.tf

@@ -74,6 +74,19 @@ variable "grafana_admin_password" {
   sensitive   = true
 }
 
+variable "grafana_host_url" {
+  description = "Grafana Host URL"
+  type        = string
+  default     = ""
+}
+
+variable "grafana_server_root_url" {
+  description = "Grafana Server Root URL"
+  type        = string
+  default     = ""
+}
+
+### OKAT Config of Grafana ###
 variable "grafana_okta_client_id" {
   description = "OKTA Client ID for Grafana"
   type        = string
@@ -86,6 +99,24 @@ variable "grafana_okta_client_secret" {
   sensitive   = true
 }
 
+variable "grafana_okta_auth_url" {
+  description = "OKTA Auth URL for Grafana"
+  type        = string
+  default     = ""
+}
+
+variable "grafana_okta_token_url" {
+  description = "OKTA Token URL for Grafana"
+  type        = string
+  default     = ""
+}
+
+variable "grafana_okta_api_url" {
+  description = "OKTA API URL for Grafana"
+  type        = string
+  default     = ""
+}
+
 variable "prometheus_operator_image_repository" {
   description = "Prometheus Operator Image repository"
   type        = string