From aeaca37ec89eec7fad9ceed333968d4ef1437385 Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Thu, 8 Sep 2022 17:13:27 +0200 Subject: [PATCH 01/14] Apply temp fix in role ansible to stack --- ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 89647f5..14094ce 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -5,7 +5,7 @@ scm: git - src: https://github.com/cycloidio/ansible-prometheus.git - version: master + version: fix_jinja_indent name: cycloid.prometheus scm: git From 3b9884bb0f90a76662f0ec402a5215987ee49ca4 Mon Sep 17 00:00:00 2001 From: marcoldp Date: Tue, 13 Sep 2022 12:10:20 +0200 Subject: [PATCH 02/14] change default AMI to debian 11 --- .forms.yml | 14 ++++++++++++++ terraform/module-prometheus/variables.tf | 6 +++++- terraform/prometheus.tf.sample | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.forms.yml b/.forms.yml index 93e69be..2a95711 100644 --- a/.forms.yml +++ b/.forms.yml @@ -96,6 +96,20 @@ default: type: string default: "2.9" terraform: + ec2-ami: + - name: "EC2 AMI name" + description: "The AMI name to use for the EC2 machine to launch. You can use a regex like debian-11-*." + key: debian_ami_name + widget: simple_text + type: string + default: "debian-11-*" + - name: "EC2 AMI owner" + description: "The name or ID of the owner of the AMI to use" + key: debian_ami_name + widget: simple_text + type: string + default: "136693071363" + application: - name: "Extra AWS tags" description: "Dict of extra tags to add on aws resources." diff --git a/terraform/module-prometheus/variables.tf b/terraform/module-prometheus/variables.tf index bafdce5..9d95308 100644 --- a/terraform/module-prometheus/variables.tf +++ b/terraform/module-prometheus/variables.tf @@ -79,7 +79,11 @@ locals { ### variable "debian_ami_name" { - default = "debian-stretch-*" + default = "debian-11-*" +} + +variable "debian_ami_owner" { + default = "136693071363" } variable "prometheus_disk_size" { diff --git a/terraform/prometheus.tf.sample b/terraform/prometheus.tf.sample index 1f779f4..644d5b4 100644 --- a/terraform/prometheus.tf.sample +++ b/terraform/prometheus.tf.sample @@ -10,6 +10,14 @@ module "prometheus" { ##################################### + #. debian_ami_name (optional): + #+ The debian name to use. You can use a regex like debian-11-*. + debian_ami_name = "debian-11-*" + + #. debian_ami_owner (optional): + #+ The name or ID of the owner of the image to use. + debian_ami_owner = "136693071363" + #. vpc_id (required): #+ Amazon VPC id on which create each components. vpc_id = data.terraform_remote_state.infrastructure.outputs.infra_vpc_id From 628a0f41591fd244444d1af342cc870a7a9c80b9 Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 13 Sep 2022 12:20:39 +0200 Subject: [PATCH 03/14] remove packages docker-ce-rootless-extras not available in debian-9 --- ansible/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/prometheus.yml b/ansible/prometheus.yml index 01089c9..d9e586c 100644 --- a/ansible/prometheus.yml +++ b/ansible/prometheus.yml @@ -31,6 +31,10 @@ roles: # Install docker - role: geerlingguy.docker + docker_packages: + - "docker-{{ docker_edition }}" + - "docker-{{ docker_edition }}-cli" + - "containerd.io" tags: - docker From cac7055f22011e7a942cc4d700dcb09180c0660a Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Mon, 6 Feb 2023 16:26:56 +0100 Subject: [PATCH 04/14] terraform: fix to have good owner in ami --- terraform/module-prometheus/ami.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/module-prometheus/ami.tf b/terraform/module-prometheus/ami.tf index aaae075..ee68320 100644 --- a/terraform/module-prometheus/ami.tf +++ b/terraform/module-prometheus/ami.tf @@ -21,6 +21,6 @@ data "aws_ami" "debian" { values = ["ebs"] } - owners = ["379101102735"] # Debian + owners = [var.debian_ami_owner] # Debian } From be45dedee565d541ec214b2e0a623dcf08f1347c Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 14 Mar 2023 16:49:48 +0100 Subject: [PATCH 05/14] Update .forms.yml --- .forms.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forms.yml b/.forms.yml index 2a95711..eddec11 100644 --- a/.forms.yml +++ b/.forms.yml @@ -62,7 +62,7 @@ default: - name: "Config repository" key: config_git_repository type: string - widget: cy_crs + widget: simple_text description: "Git repository URL containing the config of the stack." default: "git@github.com:MyUser/config.git" required: true @@ -76,10 +76,9 @@ default: - name: "Config branch" description: "Branch of the config Git repository." key: config_git_branch - widget: cy_branch + widget: simple_text type: string description: "The branch used by the config repository" - source: config_git_repository default: "config" required: true Cycloid: From c3995259f69c845ef837eb4cd2f8c5a93f9635e2 Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 14 Mar 2023 16:55:48 +0100 Subject: [PATCH 06/14] Update .forms.yml --- .forms.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forms.yml b/.forms.yml index eddec11..aabe2cd 100644 --- a/.forms.yml +++ b/.forms.yml @@ -62,7 +62,7 @@ default: - name: "Config repository" key: config_git_repository type: string - widget: simple_text + widget: cy_crs description: "Git repository URL containing the config of the stack." default: "git@github.com:MyUser/config.git" required: true @@ -76,7 +76,8 @@ default: - name: "Config branch" description: "Branch of the config Git repository." key: config_git_branch - widget: simple_text + widget: cy_branch + source: config_git_repository type: string description: "The branch used by the config repository" default: "config" From 87c963afea1a824e4817f4b7bd7e9dc8c96337f6 Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 8 Aug 2023 12:58:00 +0200 Subject: [PATCH 07/14] default-prometheus: remove grafana 80 default --- ansible/environments/default_prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/environments/default_prometheus.yml b/ansible/environments/default_prometheus.yml index aa46745..749e75d 100644 --- a/ansible/environments/default_prometheus.yml +++ b/ansible/environments/default_prometheus.yml @@ -568,7 +568,7 @@ nginx_sites_default: } 07-grafana-80: - - listen 80 default_server + - listen 80 - server_name {{ grafana_domain_name }} # - auth_basic "Restricted" # - auth_basic_user_file auth_basic/grafana From e3ff73b63278293ba3536ced477f82e05cecff6c Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 8 Aug 2023 14:14:06 +0200 Subject: [PATCH 08/14] Update rds.tf: update name to db_name --- terraform/module-prometheus/rds.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/module-prometheus/rds.tf b/terraform/module-prometheus/rds.tf index abf7834..0e4491d 100644 --- a/terraform/module-prometheus/rds.tf +++ b/terraform/module-prometheus/rds.tf @@ -33,7 +33,7 @@ resource "aws_db_instance" "grafana" { engine = var.rds_engine engine_version = var.rds_engine_version instance_class = var.rds_type - name = var.rds_database + db_name = var.rds_database username = var.rds_username password = var.rds_password From 7cb8f41e99a4ce412c85c67f918368c945483e4b Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 8 Aug 2023 14:16:35 +0200 Subject: [PATCH 09/14] Update prometheus.tf: change eip vpc=true --- terraform/module-prometheus/prometheus.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/module-prometheus/prometheus.tf b/terraform/module-prometheus/prometheus.tf index c14c023..671b0e2 100644 --- a/terraform/module-prometheus/prometheus.tf +++ b/terraform/module-prometheus/prometheus.tf @@ -108,7 +108,7 @@ resource "aws_instance" "prometheus" { resource "aws_eip" "prometheus" { instance = aws_instance.prometheus.id - vpc = true + domain = "vpc" count = var.prometheus_enable_eip ? 1 : 0 } From e533b7d736b9cf79b86fb38ba44a08c4ee1fc5fd Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 8 Aug 2023 14:26:44 +0200 Subject: [PATCH 10/14] Update default_prometheus.yml --- ansible/environments/default_prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/environments/default_prometheus.yml b/ansible/environments/default_prometheus.yml index 749e75d..df2e775 100644 --- a/ansible/environments/default_prometheus.yml +++ b/ansible/environments/default_prometheus.yml @@ -630,7 +630,7 @@ nginx_sites_default_https: 10-force-https: - listen 80 default_server - - return 301 https://$server_name$request_uri + - return 301 https://$host$request_uri 12-prometheus-443: - listen 443 ssl default_server From feefa8b7d49166d15020464ddc549e1dfdeda89d Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Wed, 13 Dec 2023 15:44:01 +0100 Subject: [PATCH 11/14] Update outputs.tf --- terraform/module-prometheus/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/module-prometheus/outputs.tf b/terraform/module-prometheus/outputs.tf index bfa0824..982cac6 100644 --- a/terraform/module-prometheus/outputs.tf +++ b/terraform/module-prometheus/outputs.tf @@ -33,7 +33,7 @@ output "rds_port" { } output "rds_database" { - value = var.create_rds_database ? aws_db_instance.grafana[0].name : "" + value = var.create_rds_database ? aws_db_instance.grafana[0].db_name : "" } output "rds_username" { From fe5d04e9f4fd11d9de9a7cdf0ddac687ee328bf4 Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Mon, 18 Mar 2024 12:53:05 +0100 Subject: [PATCH 12/14] Update requirements.yml --- ansible/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 14094ce..d7a2c64 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -10,7 +10,7 @@ scm: git - src: https://github.com/cycloidio/ansible-telegraf.git - version: master + version: 0.14.0 name: cycloid.telegraf scm: git From 5f39f621fd2defdf090eccfed113cd9b29fc58ce Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Mon, 18 Mar 2024 12:56:31 +0100 Subject: [PATCH 13/14] Update requirements.yml --- ansible/requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index d7a2c64..b7db188 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -10,12 +10,12 @@ scm: git - src: https://github.com/cycloidio/ansible-telegraf.git - version: 0.14.0 + version: master name: cycloid.telegraf scm: git - src: https://github.com/dj-wasabi/ansible-telegraf - version: master + version: 0.14.0 name: dj-wasabi.telegraf scm: git From af5bfaf4ae1c6353fc047fd8b6a5b6ec7b745d2a Mon Sep 17 00:00:00 2001 From: Marco Pereira Date: Tue, 2 Apr 2024 15:16:38 +0200 Subject: [PATCH 14/14] Update prometheus.yml --- ansible/prometheus.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ansible/prometheus.yml b/ansible/prometheus.yml index d9e586c..49c4815 100644 --- a/ansible/prometheus.yml +++ b/ansible/prometheus.yml @@ -46,6 +46,20 @@ # Monitoring client part - role: cycloid.telegraf + telegraf_agent_version: 1.10.0 + telegraf_plugins_default: + - plugin: cpu + config: + - percpu = true + - plugin: disk + - plugin: diskio + - plugin: mem + - plugin: net + - plugin: system + - plugin: swap + - plugin: netstat + - plugin: processes + - plugin: kernel tags: - telegraf