From 023f2c145f014bcffbf3201cf8162d65477049ef Mon Sep 17 00:00:00 2001 From: bharathi-tenneti Date: Wed, 22 Jul 2020 10:31:51 -0400 Subject: [PATCH 1/2] Add --metrics-addr flag --- cmd/ansible-operator/main.go | 3 +-- pkg/ansible/flags/flag.go | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/ansible-operator/main.go b/cmd/ansible-operator/main.go index 30a6565106f..f2598230507 100644 --- a/cmd/ansible-operator/main.go +++ b/cmd/ansible-operator/main.go @@ -48,7 +48,6 @@ import ( var ( metricsHost = "0.0.0.0" log = logf.Log.WithName("cmd") - metricsPort int32 = 8383 healthProbePort int32 = 6789 ) @@ -76,7 +75,7 @@ func main() { // TODO: probably should expose the host & port as an environment variables options := manager.Options{ HealthProbeBindAddress: fmt.Sprintf("%s:%d", metricsHost, healthProbePort), - MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort), + MetricsBindAddress: f.MetricsAddress, NewClient: func(cache cache.Cache, config *rest.Config, options client.Options) (client.Client, error) { c, err := client.New(config, options) if err != nil { diff --git a/pkg/ansible/flags/flag.go b/pkg/ansible/flags/flag.go index 2b304b68b13..a645567e0f6 100644 --- a/pkg/ansible/flags/flag.go +++ b/pkg/ansible/flags/flag.go @@ -32,6 +32,7 @@ type Flags struct { AnsibleVerbosity int AnsibleRolesPath string AnsibleCollectionsPath string + MetricsAddress string } const AnsibleRolesPathEnvVar = "ANSIBLE_ROLES_PATH" @@ -75,4 +76,10 @@ func (f *Flags) AddTo(flagSet *pflag.FlagSet) { "", "Path to installed Ansible Collections. If set, collections should be located in {{value}}/ansible_collections/. If unset, collections are assumed to be in ~/.ansible/collections or /usr/share/ansible/collections.", ) + flagSet.StringVar(&f.MetricsAddress, + "metrics-addr", + ":8080", + "The address the metric endpoint binds to", + ) + } From fa08beff254e11ef933682f221f14690559e33bd Mon Sep 17 00:00:00 2001 From: bharathi-tenneti Date: Wed, 22 Jul 2020 10:34:53 -0400 Subject: [PATCH 2/2] Added changelog fragment --- changelog/fragments/ansible-metrics-addr.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 changelog/fragments/ansible-metrics-addr.yml diff --git a/changelog/fragments/ansible-metrics-addr.yml b/changelog/fragments/ansible-metrics-addr.yml new file mode 100644 index 00000000000..2c6e49a2cca --- /dev/null +++ b/changelog/fragments/ansible-metrics-addr.yml @@ -0,0 +1,15 @@ +entries: + - description: > + Added `--metrics-addr` flag to ansible operator to make it configurable, and + changed the default from `:8383` to `:8080` + + kind: "change" + + # Is this a breaking change? + breaking: true + + migration: + header: Default ansible operator metrics port changed + body: > + To continue using port 8383, specify `--metrics-addr=:8383` when you start the operator. + \ No newline at end of file