Skip to content
Permalink
Browse files

deployment: add grafana oauth and fix monitoring url

  • Loading branch information...
disassembler committed Apr 11, 2019
1 parent d306104 commit 6132b92dfaf9c581757cb5a44f8b0447045ee4d2
@@ -100,6 +100,11 @@ in
enable = true;
addr = "0.0.0.0";
rootUrl = "https://${machines.nixops.externalDns}/";
extraOptions = {
AUTH_GOOGLE_ENABLED = "true";
AUTH_GOOGLE_CLIENT_ID = secrets.googleClientID;
AUTH_GOOGLE_CLIENT_SECRET = secrets.googleClientSecret;
};
};

services.prometheus2 = {
@@ -2,5 +2,7 @@
"githubClientId": "someclientid",
"githubClientSecret": "someclientsecret",
"jwtSignature": "somesignature",
"pagerdutyKey": "somekey"
}
"pagerdutyKey": "somekey",
"googleClientID": "somekey",
"googleClientSecret": "somekey"
}
@@ -210,7 +210,7 @@ resource "aws_alb_listener_rule" "monitoring" {
}
condition {
field = "host-header"
values = ["*.monitoring.*"]
values = ["monitoring.*"]
}
}

@@ -222,11 +222,11 @@ resource "aws_alb_target_group_attachment" "monitoring_a" {

resource "aws_route53_record" "monitoring_alb" {
zone_id = "${var.monitoring_public_zone}"
name = "${var.env}.${var.monitoring_tld}"
name = "monitoring.${var.monitoring_tld}"
type = "A"
alias {
name = "${aws_alb.plutus.dns_name}"
zone_id = "${aws_alb.plutus.zone_id}"
evaluate_target_health = true
}
}
}
@@ -35,7 +35,7 @@ locals {
name = "nixops"
ip = "${element(concat(aws_instance.nixops.*.private_ip, list("")), 0)}"
dns = "nixops.${element(concat(aws_route53_zone.plutus_private_zone.*.name, list("")), 0)}"
externalDns = "${var.env}.${var.monitoring_tld}"
externalDns = "monitoring.${var.monitoring_tld}"
}

bastionA = {

0 comments on commit 6132b92

Please sign in to comment.
You can’t perform that action at this time.