Merge pull request #470 from treydock/etcd-monitoring

Add etcd_listen_metric_urls parameter

Author: daianamezdrea

manifests/config/kubeadm.pp

@@ -31,6 +31,7 @@
   String $etcd_version = $kubernetes::etcd_version,
   Integer $etcd_max_wals = $kubernetes::etcd_max_wals,
   Integer $etcd_max_request_bytes = $kubernetes::etcd_max_request_bytes,
+  Optional[String] $etcd_listen_metric_urls = $kubernetes::etcd_listen_metric_urls,
   String $token = $kubernetes::token,
   String $ttl_duration = $kubernetes::ttl_duration,
   String $discovery_token_hash = $kubernetes::discovery_token_hash,

manifests/init.pp

@@ -193,6 +193,10 @@
 #     This will tell etcd the maximum size of a request in bytes
 #   Defaults to 1572864
 #
+# [*etcd_listen_metric_urls*]
+#     The URL(s) to listen on to respond to /metrics and /health for etcd
+#   Defaults to undef
+#
 # [*etcd_ca_key*]
 #   This is the ca certificate key data for the etcd cluster. This must be passed as string not as a file.
 #   Defaults to undef
@@ -529,6 +533,7 @@
   Variant[String, Integer] $etcd_compaction_retention            = 0,
   Integer $etcd_max_wals                                         = 5,
   Integer $etcd_max_request_bytes                                = 1572864,
+  Optional[String] $etcd_listen_metric_urls                      = undef,
   Optional[String] $etcd_ca_key                                  = undef,
   Optional[String] $etcd_ca_crt                                  = undef,
   Optional[String] $etcdclient_key                               = undef,

spec/classes/config/kubeadm_spec.rb

@@ -55,10 +55,25 @@
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service') }
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service').with_content(%r{.*--initial-cluster *}) }
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service').without_content(%r{.*--discovery-srv.*}) }
+    it { is_expected.to contain_file('/etc/systemd/system/etcd.service').without_content(%r{.*--listen-metrics-urls.*}) }
     it { is_expected.not_to contain_file('/etc/default/etcd') }
     it { is_expected.to contain_file('/etc/kubernetes/config.yaml') }
     it { is_expected.to contain_file('/etc/kubernetes/config.yaml').with_content(%r{foo:\n- bar\n- baz}) }
     it { is_expected.to contain_file('/etc/kubernetes/config.yaml').with_content(%r{kubeletConfiguration:\n  baseConfig:\n    baz:\n    - bar\n    - foo}) }
+
+    context 'with etcd_listen_metric_urls defined' do
+      let(:params) do
+        {
+          'manage_etcd' => true,
+          'kubeadm_extra_config' => { 'foo' => ['bar', 'baz'] },
+          'kubelet_extra_config' => { 'baz' => ['bar', 'foo'] },
+          'kubelet_extra_arguments' => ['foo'],
+          'etcd_listen_metric_urls' => 'http://0.0.0.0:2381',
+        }
+      end
+
+      it { is_expected.to contain_file('/etc/systemd/system/etcd.service').with_content(%r{.*--listen-metrics-urls http://0.0.0.0:2381.*}) }
+    end
   end
 
   context 'with manage_etcd => true and delegated_pki => true' do
@@ -94,6 +109,7 @@
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service').with_content(%r{.*--initial-cluster *}) }
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service').with_content(%r{.*--auto-compaction-mode*}) }
     it { is_expected.to contain_file('/etc/systemd/system/etcd.service').without_content(%r{.*--discovery-srv.*}) }
+    it { is_expected.to contain_file('/etc/systemd/system/etcd.service').without_content(%r{.*--listen-metrics-urls.*}) }
     it { is_expected.not_to contain_file('/etc/default/etcd') }
     it { is_expected.to contain_file('/etc/kubernetes/config.yaml') }
     it { is_expected.to contain_file('/etc/kubernetes/config.yaml').with_content(%r{foo:\n- bar\n- baz}) }
@@ -150,6 +166,23 @@
     it { is_expected.to contain_file('/etc/default/etcd').with_content(%r{.*ETCD_INITIAL_CLUSTER=.*}) }
     it { is_expected.to contain_file('/etc/default/etcd').with_content(%r{.*ETCD_AUTO_COMPACTION_MODE=.*}) }
     it { is_expected.to contain_file('/etc/default/etcd').without_content(%r{.*ETCD_DISCOVERY_SRV=.*}) }
+    it { is_expected.to contain_file('/etc/default/etcd').without_content(%r{.*ETCD_LISTEN_METRICS_URLS=.*}) }
+
+    context 'with etcd_listen_metric_urls defined' do
+      let(:params) do
+        {
+          'etcd_install_method' => 'package',
+          'kubeadm_extra_config' => { 'foo' => ['bar', 'baz'] },
+          'kubelet_extra_config' => { 'baz' => ['bar', 'foo'] },
+          'kubelet_extra_arguments' => ['foo'],
+          'manage_etcd' => true,
+          'etcd_version' => '3.3.0',
+          'etcd_listen_metric_urls' => 'http://0.0.0.0:2381',
+        }
+      end
+
+      it { is_expected.to contain_file('/etc/default/etcd').with_content(%r{.*ETCD_LISTEN_METRICS_URLS="http://0.0.0.0:2381".*}) }
+    end
   end
 
   context 'manage_etcd => true and etcd_install_method => package and etcd_discovery_srv => etcd-autodiscovery' do

templates/etcd/etcd.erb

@@ -17,6 +17,9 @@ ETCD_AUTO_COMPACTION_MODE="<%= @etcd_compaction_method %>"
 ETCD_AUTO_COMPACTION_RETENTION="<%= @etcd_compaction_retention %>"
 ETCD_MAX_WALS="<%= @etcd_max_wals %>"
 ETCD_MAX_REQUEST_BYTES="<%= @etcd_max_request_bytes %>"
+<%- if @etcd_listen_metric_urls -%>
+ETCD_LISTEN_METRICS_URLS="<%= @etcd_listen_metric_urls %>"
+<%- end -%>
 ETCD_ADVERTISE_CLIENT_URLS="https://<%= @etcd_ip %>:2379"
 ETCD_CERT_FILE="/etc/kubernetes/pki/etcd/server.crt"
 ETCD_KEY_FILE="/etc/kubernetes/pki/etcd/server.key"

templates/etcd/etcd.service.erb

@@ -40,8 +40,11 @@ ExecStart=/usr/local/bin/etcd --name <%= @etcd_hostname %> \
 <% if @etcd_version >= "3.3.0" -%>
     --auto-compaction-mode <%= @etcd_compaction_method %> \
 <% end -%>
-    --max-wals <%= @etcd_max_wals %> \
     --max-request-bytes <%= @etcd_max_request_bytes %>
+<%- if @etcd_listen_metric_urls -%>
+    --listen-metrics-urls <%= @etcd_listen_metric_urls %> \
+<%- end -%>
+    --max-wals <%= @etcd_max_wals %>
 
 
 [Install]