Skip to content

Commit 8e3040c

Browse files
committed
Added configuration options to allow anonymous access
1 parent ff50c76 commit 8e3040c

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

Diff for: modules/grafana/ecs.tf

+3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ data "template_file" "grafana_task_config" {
2828
vars {
2929
container_name = "grafana-server"
3030
grafana_version = "${var.grafana_version}"
31+
grafana_enable_anonymous_access = "${var.grafana_enable_anonymous_access}"
3132
grafana_container_memory = "${var.grafana_memory_limit}"
33+
grafana_user = "${var.grafana_admin_user}"
3234
grafana_password = "${var.grafana_admin_password}"
35+
grafana_plugins = "${var.grafana_plugins}"
3336
grafana_url = "${var.grafana_url}"
3437
http_transport_port = "${var.grafana_port}"
3538
volume_name = "grafana-data"

Diff for: modules/grafana/resources/grafana.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,20 @@
1414
"environment": [
1515
{
1616
"name": "GF_INSTALL_PLUGINS",
17-
"value": "grafana-clock-panel,grafana-piechart-panel,grafana-worldmap-panel,grafana-simple-json-datasource"
17+
"value": "${grafana_plugins}"
18+
},
19+
{
20+
"name": "GF_AUTH_ANONYMOUS_ENABLED",
21+
"value": "${grafana_enable_anonymous_access}"
1822
},
1923
{
2024
"name": "GF_SERVER_ROOT_URL",
2125
"value": "${grafana_url}"
2226
},
27+
{
28+
"name": "GF_SECURITY_ADMIN_USER",
29+
"value": "${grafana_user}"
30+
},
2331
{
2432
"name": "GF_SECURITY_ADMIN_PASSWORD",
2533
"value": "${grafana_password}"

Diff for: modules/grafana/variables.tf

+16
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@ variable "grafana_version" {
8686
default = "4.3.2"
8787
}
8888

89+
variable "grafana_plugins" {
90+
type = "string"
91+
default = "grafana-clock-panel,grafana-piechart-panel,grafana-worldmap-panel,grafana-simple-json-datasource"
92+
}
93+
94+
variable "grafana_admin_user" {
95+
type = "string"
96+
default = "admin"
97+
}
98+
99+
variable "grafana_enable_anonymous_access" {
100+
type = "string"
101+
default = "false"
102+
}
103+
89104
variable "grafana_admin_password" {
90105
type = "string"
91106
}
@@ -100,6 +115,7 @@ variable "grafana_port" {
100115

101116
variable "grafana_memory_limit" {
102117
description = "Amount of memory to allocate for grafana process"
118+
default = 512
103119
}
104120

105121
variable "grafana_nodes_count" {

0 commit comments

Comments
 (0)