Skip to content

Commit 1c589c0

Browse files
committed
add_variable_for_prometheus_metrics
1 parent 8b8239f commit 1c589c0

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

Diff for: .pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repos:
2-
- repo: git://github.com/antonbabenko/pre-commit-terraform
2+
- repo: http://github.com/antonbabenko/pre-commit-terraform
33
rev: v1.55.0
44
hooks:
55
- id: terraform_fmt
66
args:
77
- --args=-recursive
88
- id: terraform_tflint
99
- id: terraform_docs
10-
- repo: git://github.com/pre-commit/pre-commit-hooks
10+
- repo: http://github.com/pre-commit/pre-commit-hooks
1111
rev: v4.0.1
1212
hooks:
1313
- id: check-merge-conflict

Diff for: README.md

+1
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ terraform destroy
428428
| <a name="input_metrics_autoscaling"></a> [metrics\_autoscaling](#input\_metrics\_autoscaling) | A list of metrics to collect. The allowed values are GroupDesiredCapacity, GroupInServiceCapacity, GroupPendingCapacity, GroupMinSize, GroupMaxSize, GroupInServiceInstances, GroupPendingInstances, GroupStandbyInstances, GroupStandbyCapacity, GroupTerminatingCapacity, GroupTerminatingInstances, GroupTotalCapacity, GroupTotalInstances. | `list(string)` | `null` | no |
429429
| <a name="input_overrides"></a> [overrides](#input\_overrides) | This map provides the possibility to override some defaults. <br>The following attributes are supported: <br> * `name_sg` set the name prefix and overwrite the `Name` tag for all security groups created by this module. <br> * `name_runner_agent_instance` set the name prefix and override the `Name` tag for the EC2 gitlab runner instances defined in the auto launch configuration. <br> * `name_docker_machine_runners` override the `Name` tag of EC2 instances created by the runner agent. <br> * `name_iam_objects` set the name prefix of all AWS IAM resources created by this module. | `map(string)` | <pre>{<br> "name_docker_machine_runners": "",<br> "name_iam_objects": "",<br> "name_runner_agent_instance": "",<br> "name_sg": ""<br>}</pre> | no |
430430
| <a name="input_permissions_boundary"></a> [permissions\_boundary](#input\_permissions\_boundary) | Name of permissions boundary policy to attach to AWS IAM roles | `string` | `""` | no |
431+
| <a name="input_prometheus_listen_address"></a> [prometheus\_listen\_address](#input\_prometheus\_listen\_address) | Defines an address (<host>:<port>) the Prometheus metrics HTTP server should listen on. | `string` | `""` | no |
431432
| <a name="input_role_tags"></a> [role\_tags](#input\_role\_tags) | Map of tags that will be added to the role created. Useful for tag based authorization. | `map(string)` | `{}` | no |
432433
| <a name="input_runner_agent_uses_private_address"></a> [runner\_agent\_uses\_private\_address](#input\_runner\_agent\_uses\_private\_address) | Restrict the runner agent to the use of a private IP address. If `runner_agent_uses_private_address` is set to `false` it will override the `runners_use_private_address` for the agent. | `bool` | `true` | no |
433434
| <a name="input_runner_ami_filter"></a> [runner\_ami\_filter](#input\_runner\_ami\_filter) | List of maps used to create the AMI filter for the Gitlab runner docker-machine AMI. | `map(list(string))` | <pre>{<br> "name": [<br> "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"<br> ]<br>}</pre> | no |

Diff for: main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ locals {
131131
bucket_name = local.bucket_name
132132
shared_cache = var.cache_shared
133133
sentry_dsn = var.sentry_dsn
134+
prometheus_listen_address = var.prometheus_listen_address
134135
}
135136
)
136137
}

Diff for: template/runner-config.tpl

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ concurrent = ${runners_concurrent}
22
check_interval = ${runners_check_interval}
33
sentry_dsn = "${sentry_dsn}"
44
log_format = "json"
5+
listen_address = "${prometheus_listen_address}"
56

67
[[runners]]
78
name = "${runners_name}"

Diff for: variables.tf

+6
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,12 @@ variable "sentry_dsn" {
704704
type = string
705705
}
706706

707+
variable "prometheus_listen_address" {
708+
default = ""
709+
description = "Defines an address (<host>:<port>) the Prometheus metrics HTTP server should listen on."
710+
type = string
711+
}
712+
707713
variable "docker_machine_egress_rules" {
708714
description = "List of egress rules for the docker-machine instance(s)."
709715
type = list(object({

0 commit comments

Comments
 (0)