Skip to content

Add support for sending k8s logs to elasticsearch via fluentd. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmonkman merged 4 commits into from
Aug 25, 2020
Merged

Add support for sending k8s logs to elasticsearch via fluentd. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6e57ed
Add support for sending k8s logs to elasticsearch via fluentd.
bmonkman Aug 24, 2020
526ba45
Fix k8s dashboard trying to constantly modify resources
bmonkman Aug 24, 2020
608539d
Fix variable name
bmonkman Aug 25, 2020
e7378a0
Switch Fluentd ES connection to https
bmonkman Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions templates/kubernetes/terraform/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ terraform {
module "kubernetes" {
source = "../../modules/kubernetes"

project = "<% .Name %>"

environment = "dev"
region = "<% index .Params `region` %>"

Expand All @@ -23,4 +25,7 @@ module "kubernetes" {

# Registration email for LetsEncrypt
cert_manager_acme_registration_email = "devops@<% index .Params `stagingHostRoot` %>"

# Logging configuration
logging_type = "<% index .Params `loggingType` %>"
}
5 changes: 5 additions & 0 deletions templates/kubernetes/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ provider "aws" {
module "kubernetes" {
source = "../../modules/kubernetes"

project = "<% .Name %>"

environment = "prod"
region = "<% index .Params `region` %>"

Expand All @@ -27,4 +29,7 @@ module "kubernetes" {

# Registration email for LetsEncrypt
cert_manager_acme_registration_email = "devops@<% index .Params `productionHostRoot` %>"

# Logging configuration
logging_type = "<% index .Params `loggingType` %>"
}
2 changes: 2 additions & 0 deletions templates/kubernetes/terraform/environments/stage/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ provider "aws" {
module "kubernetes" {
source = "../../modules/kubernetes"

project = "<% .Name %>"

environment = "stage"
region = "<% index .Params `region` %>"

Expand Down
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module "iam_assumable_role_cert_manager" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> v2.14.0"
create_role = true
role_name = "<% .Name %>-k8s-${var.environment}-cert-manager"
role_name = "${var.project}-k8s-${var.environment}-cert-manager"
provider_url = replace(data.aws_eks_cluster.cluster.identity.0.oidc.0.issuer, "https://", "")
role_policy_arns = [aws_iam_policy.cert_manager.arn]
oidc_fully_qualified_subjects = ["system:serviceaccount:${local.cert_manager_namespace}:cert-manager"]
Expand Down
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module "iam_assumable_role_cluster_autoscaler" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> v2.14.0"
create_role = true
role_name = "<% .Name %>-k8s-${var.environment}-cluster-autoscaler"
role_name = "${var.project}-k8s-${var.environment}-cluster-autoscaler"
provider_url = replace(data.aws_eks_cluster.cluster.identity.0.oidc.0.issuer, "https://", "")
role_policy_arns = [aws_iam_policy.cluster_autoscaler.arn]
oidc_fully_qualified_subjects = ["system:serviceaccount:${local.cluster_autoscaler_namespace}:cluster-autoscaler-aws-cluster-autoscaler"]
Expand Down
8 changes: 3 additions & 5 deletions templates/kubernetes/terraform/modules/kubernetes/database-service.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
data "aws_db_instance" "database" {
db_instance_identifier = "<% .Name %>-${var.environment}"
db_instance_identifier = "${var.project}-${var.environment}"
}

resource "kubernetes_namespace" "app_namespace" {
metadata {
name = "<% .Name %>"
name = "${var.project}"
}
}

resource "kubernetes_service" "app_db" {
## this should match the deployable backend's name/namespace
## it uses this service to connect and create application user
## https://github.com/commitdev/zero-deployable-backend/blob/b2cee21982b1e6a0ac9996e2a1bf214e5bf10ab5/db-ops/create-db-user.sh#L6
metadata {
metadata {
namespace = kubernetes_namespace.app_namespace.metadata[0].name
name = "database"
}
spec {
type = "ExternalName"
external_name = data.aws_db_instance.database.address
}

depends_on = [kubernetes_namespace.app_namespace]
}
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/external_dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module "iam_assumable_role_external_dns" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> v2.14.0"
create_role = true
role_name = "<% .Name %>-k8s-${var.environment}-external-dns"
role_name = "${var.project}-k8s-${var.environment}-external-dns"
provider_url = replace(data.aws_eks_cluster.cluster.identity.0.oidc.0.issuer, "https://", "")
role_policy_arns = [aws_iam_policy.external_dns.arn]
oidc_fully_qualified_subjects = ["system:serviceaccount:kube-system:external-dns"]
Expand Down
109 changes: 41 additions & 68 deletions templates/kubernetes/terraform/modules/kubernetes/ingress/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
locals {
log_format = <<EOF
{
"time_local": "$time_local",
"timestamp": "$time_iso8601",
"remote_addr": "$remote_addr",
"remote_user": "$remote_user",
"request": "$request",
"status": "$status",
"request_id": "$req_id",
"bytes_sent": "$bytes_sent",
"request_method": "$request_method",
"request_length": "$request_length",
"request_time": "$request_time",
"http_referrer": "$http_referer",
"http_user_agent": "$http_user_agent",
"host": "$host",
"request_proto": "$server_protocol",
"path": "$uri",
"request_query": "$args",
"http_x_forwarded_for": "$proxy_add_x_forwarded_for"
}
EOF

}

resource "kubernetes_namespace" "ingress_nginx" {
metadata {
name = "ingress-nginx"
Expand All @@ -11,66 +37,52 @@ resource "kubernetes_namespace" "ingress_nginx" {
resource "kubernetes_config_map" "nginx_configuration" {
metadata {
name = "nginx-configuration"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
}
}
data = {
proxy-real-ip-cidr = "0.0.0.0/0",
use-forwarded-headers = "true",
use-proxy-protocol = "false"
proxy-real-ip-cidr = "0.0.0.0/0",
use-forwarded-headers = "true",
use-proxy-protocol = "false"
log-format-escape-json = "true"
log-format-upstream = replace(local.log_format, "\n", "")
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

# resource "kubernetes_config_map" "nginx_configuration" {
# metadata {
# name = "nginx-configuration"
# namespace = "ingress-nginx"
# labels = {
# "app.kubernetes.io/name" = "ingress-nginx",
# "app.kubernetes.io/part-of" = "ingress-nginx"
# }
# }
# depends_on = [kubernetes_namespace.ingress_nginx]
# }

resource "kubernetes_config_map" "tcp_services" {
metadata {
name = "tcp-services"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
}
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

resource "kubernetes_config_map" "udp_services" {
metadata {
name = "udp-services"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
}
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

resource "kubernetes_service_account" "nginx_ingress_serviceaccount" {
metadata {
name = "nginx-ingress-serviceaccount"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
}
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

resource "kubernetes_cluster_role" "nginx_ingress_clusterrole" {
Expand Down Expand Up @@ -116,7 +128,7 @@ resource "kubernetes_cluster_role" "nginx_ingress_clusterrole" {
resource "kubernetes_role" "nginx_ingress_role" {
metadata {
name = "nginx-ingress-role"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
Expand All @@ -143,13 +155,12 @@ resource "kubernetes_role" "nginx_ingress_role" {
api_groups = [""]
resources = ["endpoints"]
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

resource "kubernetes_role_binding" "nginx_ingress_role_nisa_binding" {
metadata {
name = "nginx-ingress-role-nisa-binding"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
Expand All @@ -158,14 +169,13 @@ resource "kubernetes_role_binding" "nginx_ingress_role_nisa_binding" {
subject {
kind = "ServiceAccount"
name = "nginx-ingress-serviceaccount"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
}
role_ref {
api_group = "rbac.authorization.k8s.io"
kind = "Role"
name = "nginx-ingress-role"
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

resource "kubernetes_cluster_role_binding" "nginx_ingress_clusterrole_nisa_binding" {
Expand All @@ -179,7 +189,7 @@ resource "kubernetes_cluster_role_binding" "nginx_ingress_clusterrole_nisa_bindi
subject {
kind = "ServiceAccount"
name = "nginx-ingress-serviceaccount"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
}
role_ref {
api_group = "rbac.authorization.k8s.io"
Expand All @@ -195,7 +205,7 @@ resource "kubernetes_deployment" "nginx_ingress_controller" {
]
metadata {
name = "nginx-ingress-controller"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
Expand Down Expand Up @@ -307,7 +317,7 @@ resource "kubernetes_deployment" "nginx_ingress_controller" {
resource "kubernetes_service" "ingress_nginx" {
metadata {
name = "ingress-nginx"
namespace = "ingress-nginx"
namespace = kubernetes_namespace.ingress_nginx.metadata[0].name
labels = {
"app.kubernetes.io/name" = "ingress-nginx",
"app.kubernetes.io/part-of" = "ingress-nginx"
Expand All @@ -331,41 +341,4 @@ resource "kubernetes_service" "ingress_nginx" {
type = "LoadBalancer"
external_traffic_policy = "Local"
}
depends_on = [kubernetes_namespace.ingress_nginx]
}

# HTTPS Load balancer
# resource "kubernetes_service" "ingress_nginx" {
# metadata {
# name = "ingress-nginx"
# namespace = "ingress-nginx"
# labels = {
# "app.kubernetes.io/name" = "ingress-nginx",
# "app.kubernetes.io/part-of" = "ingress-nginx"
# }
# annotations = {
# "service.beta.kubernetes.io/aws-load-balancer-backend-protocol" = "http",
# "service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout" = "60",
# "service.beta.kubernetes.io/aws-load-balancer-ssl-cert" = var.load_balancer_ssl_cert_arn,
# "service.beta.kubernetes.io/aws-load-balancer-ssl-ports" = "https"
# }
# }
# spec {
# port {
# name = "http"
# port = 80
# target_port = "http"
# }
# port {
# name = "https"
# port = 443
# target_port = "http"
# }
# selector = {
# "app.kubernetes.io/name" = "ingress-nginx",
# "app.kubernetes.io/part-of" = "ingress-nginx"
# }
# type = "LoadBalancer"
# }
# depends_on = [kubernetes_namespace.ingress_nginx]
# }
Loading