Make the CI happy.

libbeat/docker-compose.yml

@@ -20,6 +20,8 @@ services:
       - KIBANA_PORT=5601
       - ES_MONITORING_HOST=elasticsearch_monitoring
       - ES_MONITORING_PORT=9200
+      - ES_HOST_SSL=elasticsearchssl
+      - ES_PORT_SSL=9200
     env_file:
       - ${PWD}/build/test.env
     volumes:
@@ -36,7 +38,7 @@ services:
     depends_on:
       elasticsearch:            { condition: service_healthy }
       elasticsearch_monitoring: { condition: service_healthy }
-      elasticsearch_ssl:        { condition: service_healthy }
+      elasticsearchssl:         { condition: service_healthy }
       logstash:                 { condition: service_healthy }
       kafka:                    { condition: service_healthy }
       redis:                    { condition: service_healthy }
@@ -58,7 +60,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9200"]
 
-  elasticsearch_ssl:
+  elasticsearchssl:
     extends:
       file: ${ES_BEATS}/testing/environments/${TESTING_ENVIRONMENT}.yml
       service: elasticsearch
@@ -76,16 +78,16 @@ services:
       - "indices.id_field_data.enabled=true"
       - "xpack.license.self_generated.type=trial"
       - "xpack.security.http.ssl.enabled=true"
-      - "xpack.security.http.ssl.key=/usr/share/elasticsearch/config/pki/localhost/localhost.key"
-      - "xpack.security.http.ssl.certificate=/usr/share/elasticsearch/config/pki/localhost/localhost.crt"
+      - "xpack.security.http.ssl.key=/usr/share/elasticsearch/config/pki/elasticsearchssl/elasticsearchssl.key"
+      - "xpack.security.http.ssl.certificate=/usr/share/elasticsearch/config/pki/elasticsearchssl/elasticsearchssl.crt"
       - "xpack.security.http.ssl.certificate_authorities=/usr/share/elasticsearch/config/pki/ca/ca.crt"
       # Do no used indices as the storage for credentials, using file based allow Elasticsearch
       # to be online and green much quicker.
       - "xpack.security.authc.realms.file.file1.order=0"
     volumes:
       - ${ES_BEATS}/testing/environments/docker/elasticsearch/pki:/usr/share/elasticsearch/config/pki:ro
     ports:
-      - "9205:9200"
+      - 9200
     command: bash -c "bin/elasticsearch-users useradd admin -r superuser -p changeme | /usr/local/bin/docker-entrypoint.sh eswrapper"
 
   # This host name is static because of the certificate.

libbeat/scripts/Makefile

@@ -40,8 +40,8 @@ ES_HOST?=elasticsearch
 ES_PORT?=9200
 ES_USER?=beats
 ES_PASS?=testing
-ES_HOST_SSL?=elasticsearch_ssl
-ES_PORT_SSL?=9205
+ES_HOST_SSL?=elasticsearchssl
+ES_PORT_SSL?=9200
 KIBANA_HOST?=kibana
 KIBANA_PORT?=5601
 # Kibana's Elaticsearch user

libbeat/tests/system/test_ca_pinning.py

@@ -38,7 +38,7 @@ def test_sending_events_with_a_good_sha256(self):
                 "username": "admin",
                 "password": "changeme",
                 "ssl.certificate_authorities": [ca],
-                "ssl.ca_sha256": "s1fmFCvb3eN6Zfk14+zD23JtJalUhCWl3MtwPGrQNIE=",
+                "ssl.ca_sha256": "8hZS8gpciuzlu+7Xi0sdv8T7RKRRxG1TWKumUQsDam0=",
             },
         )
 

testing/environments/docker/elasticsearch/pki/ca/ca.crt

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIVAODFILz66WOYfr7VpNE1vUQzw10AMA0GCSqGSIb3DQEB
+MIIDSjCCAjKgAwIBAgIVAOshUH7Va8Kh1QeA4KgLw8dI29M4MA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMB4XDTIwMDIwMzE2MDgzMloXDTIzMDIwMjE2MDgzMlowNDEyMDAG
+ZXJhdGVkIENBMB4XDTIwMDIwNzE2MzUzMFoXDTIzMDIwNjE2MzUzMFowNDEyMDAG
 A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd7SvL+Zu+/gA+/FNuSNHF
-fNu1sbTf53CcAnERNsMcFF6mOGs9BbER6u/1ErjQk3ThqVYySpxBxQR2fgarRJsY
-BnDxIu0qauM9AVN4wI4VXpF07ZwgJ6aMbGnldvJgH53ge7BMGnJGYyFBkHPR5fTL
-dDNo116VKT2zhJ6o+ihLA95PPHDZlFiK/ZwSxPy1BFqZMt9vvfe3tz0IlRc0teK9
-QL9t8BKTtypTBQFjEQ/+KH92zHpMU9/mAqpFiKYrLgu8B0gJN2nWJ1Lju0A4EnT8
-CnH2hY6M6jqRud+pLCBy0DhVX8RvkTNaRmkZZd43bK8/u/K0v5LURDA5IT9EnSRx
-AgMBAAGjUzBRMB0GA1UdDgQWBBQPsT46DK92wDbj5Yk0xVHApcBCEzAfBgNVHSME
-GDAWgBQPsT46DK92wDbj5Yk0xVHApcBCEzAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBCwUAA4IBAQBHOCsSkPFC61oQvMprhebs48eQOdqeHp8DUgaCeHl0Wb/a
-Rc/hHbq8F3eiovkQ2Hw59G/9WgOzd9aeWH74d/dXdFWKl74rs1FGP9plw+lbf8TC
-zl7aYMrM//d3IVhHYpCOyNwOZ96QEk3aLuu82aDAfTpqnMbS+4lSetuDhFj+mtzV
-0BYyRtKxbJO2qhVCc83tYIcraDqGHSLIel65H4nIOLjQOxRYQUVObKBFigLAvw3y
-IO4BnWSNc4rDE+lgWpVVt+CJTCNzxy2A0IqZ7gxGHJeYuldFDx5HfBG+gfzhxq7H
-rU+PSaxIzCBgAmJttL9fd5i9N37IXW9t/hutmSVG
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv7Oq3uE0kO5Ij41U9M7ee
+xOtprdA3joR68B32/SQ1FW9Igk3f/DTn8MqlAFexwzGAONPNIcj44W9KhVeT9aFA
+qCKfS2no+V9aKds6wyEHY3sAmYICEHBMDor9KhPnIc8m/gl3TcGMKmouoHqFPNKE
+irilBDUO7rs5w46lcbxJrHTlEA6xyQLT7+sJ4DswO/xeoemPTBa7vzkoVUyZ50/D
+VSUulY4XtmQvmbe4Aa0p8sgLNzFAJRl3XqZMECwO2iJ9jFwKCUT4EbFW4aTQtylI
+CBax+Cn79vKpp3gO1WVu1cdcQW3+ciAJyUydTsCA2zjGYZyzL84z7eCHW946WQWD
+AgMBAAGjUzBRMB0GA1UdDgQWBBQZKfuW0o2yabRo9tosWldK43GDbjAfBgNVHSME
+GDAWgBQZKfuW0o2yabRo9tosWldK43GDbjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBCwUAA4IBAQAHeIJPwxvHTismlbFJKcCM3kr/ZblXguiFTmhqylqa8wFI
+ke1xpTUrdfTAkD0ohmtPAUMPBkHeyHKzvxK7Blh230/lxybJNVSpfp7FQvj1EsmW
+7FbIsKoj9MwJ2Lg5h6rnFA4t0bL3q74HV+vqpMoJDe92uX0GaSH/iYb+BfZ2El8m
+QfANac0O+TE70i0++v/BzUAkqhJB3pG/3ziPzdFWlXf4iUG0YhMG4Ig5P/SvGz/V
+MNc+uq3bh9xsNrtcm2S/pVdt/gdsujg9MTaoOr+maJPB/+LBrkZWtZcbUe++1+Z7
+32exp0eKNA0i90cc/Ayr79MOFDxdgI7baBnLPPa8
 -----END CERTIFICATE-----

testing/environments/docker/elasticsearch/pki/ca/ca.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

testing/environments/docker/elasticsearch/pki/elasticsearchssl/elasticsearchssl.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKjCCAhKgAwIBAgIUZWu3nanhrFaNe6kMhtsPM4neUCYwDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwHhcNMjAwMjA3MTYzNjMxWhcNMjMwMjA2MTYzNjMxWjAbMRkwFwYD
+VQQDExBlbGFzdGljc2VhcmNoc3NsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAl09yaI0HI3I8DmJ0UyRDedFNBFOfsFh7sYGGElj0h4H1kt8oEA3uYIH/
+oPUQ9Mkn30m+qccdQC6/pz/ZgkCfOckXtX1PVLEAK9MEqEwj6UU4uMgSIUTjXN22
+m/YedSJFtwGiQqFbCD1LijRLjlDCvHZ1W5M6XYzWoUN1y4MDZSD755TuluAp277j
+6yuJIEw5SsQ/Nw4Coaqexy1ha7G/y3L+3t4SFrXaBqe+nM1xPDR0Is/p8iTdcdlu
+kEFmbIqDGAPx2jvTRWYikL3MmR4u58AoIk0WqeGmLefxzV6jC6zsQGRnpmtz3jye
+XHRfodf3crMZm+mw6FNPk4PJzZSsXwIDAQABo00wSzAdBgNVHQ4EFgQUmcNplxkS
++zHt5LWVM67Tzws8fBEwHwYDVR0jBBgwFoAUGSn7ltKNsmm0aPbaLFpXSuNxg24w
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAPpFdJpuwBXqBZezfQTTQFkKm
+EHz3UDYKA3nHt2tcmFqAEXYx4cXaor5GG9YLThGWUp2iBXIyIzUZnpkM2wl/pIlz
+8fMFxvtS6hQ2VwFDHAo2ht8ay7/vTrKcVvNL5NtPHjRlHhT94XiwYNpneiB6EMGP
++lTxWXSLpSnl0AnFdpLzPpS6DiaMHAPChAbDGK9i76D13sQBJZ/lgQiMmntEWsTr
+0NNsjBk2xjMQAYs/eJXfENkAxvuzJTbQdJ1kMOvybONT4Lw8UIhoRpRY7EspwlI3
+encLBhcxYJjpzSPqdDQQRVXd4zUNFe4595LKEsm14mXaTy682HAe/HvN+yO7qw==
+-----END CERTIFICATE-----

testing/environments/docker/elasticsearch/pki/elasticsearchssl/elasticsearchssl.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAl09yaI0HI3I8DmJ0UyRDedFNBFOfsFh7sYGGElj0h4H1kt8o
+EA3uYIH/oPUQ9Mkn30m+qccdQC6/pz/ZgkCfOckXtX1PVLEAK9MEqEwj6UU4uMgS
+IUTjXN22m/YedSJFtwGiQqFbCD1LijRLjlDCvHZ1W5M6XYzWoUN1y4MDZSD755Tu
+luAp277j6yuJIEw5SsQ/Nw4Coaqexy1ha7G/y3L+3t4SFrXaBqe+nM1xPDR0Is/p
+8iTdcdlukEFmbIqDGAPx2jvTRWYikL3MmR4u58AoIk0WqeGmLefxzV6jC6zsQGRn
+pmtz3jyeXHRfodf3crMZm+mw6FNPk4PJzZSsXwIDAQABAoIBAB1rHu1g7hBgN3j8
+f21i0ZOvs++xaozYx0Pd0PlkPjbSd7KUnK9yZfRxkgfzXdaZ/ZyWM/HCetdtv2l/
+KoT+l3aeuHNa57+pokTjBDbMhvbltH+Itq2tPR9jJAvysD1J6pAIS0n1IUPa1wMJ
+497JqPMHfQ3O9DwYE+rKuO5WjKRulUrL8K3OgHndLiHPZuUfIveSd6qux7wAebmD
+OpWukVvYoC2k//Bgopdyg9VxVZtTg1SZlyFZ8wteDrbgF+eDMp9uIRddrvMUCwH4
++GJOzkXxgkeOANjr5obMRjrr5hwoCE+RObCXAT3lx+nfCvYY5Lb72WWPQPEJ5ltP
+xuxYY/ECgYEA71+DxCSUpxaK6THpJ10Z4FlTV0YAFfnMx9Jecn4CaJpQrWYFjLB7
+zkhlJWWyzPMc56+5olfcMEXHO9dT1/w3lFlJmRaS4yu/ZdPf2E6Pi6eXpeRYshj9
+NIq/pMCB1XxNogGzQA0AFBc+vw6Tx7LG+Bz/Yafi4SQN89I9v2SaeiMCgYEAodIE
+epMZmVhlmrVzjPKcYtqWu464Sb3sHBwgnxvKcU1NUAUjTuzI9DwrJYgrA9NBcgHq
+ckwbqiHNcej4MGFk7nN98U47eb+p6PAPNde7q42iNz2q7pKlNVml+Eg/wC2lhNah
+N6K6S4wvTM6ujNIZGQ3DyKQC0tCMu+LnPxYYcpUCgYEAi9E2nfLgAVjheqR0k1GG
+M8z5KRjyI+PtASqXkDiaH49DYIUe6LaNGkifC+EDN0MptwqlW3YGXwvi+8kiaB4i
+OLyOiKTu11JOUaQYM7hvkBssMPHX/O8rtuz0U78+FvysO9zSXq85RILvW5mgKBz8
+qyAE632sv+TXYXuEJa8VrBECgYEAmAmh6aSh7aDPPc90NJ6R7pMgAjKy1Z4a48JN
+qBBNYazWkfNx3Cq/GDIb+9R3Tc3D9KD2LNNzPqMpyvevkI1BboSWdQ0i9l3s/w3l
+zJnYGvQk0DAhlKu1i22icac4NpDsreWWbZZ34Jliq5CZEXgo2pBDPhVTDc2iHLmw
+uWZCLA0CgYAG99zukAD9iq2MyGiyuJ8dYU0dDvyaKcSkM3pfsgA4TpSlZljDKnAH
+1VVPGB3pOHUYbcxsD2/1AJBlplvq8OVcrURuSXYl9PtwczJBgfSNNtSkHvMirWzo
+q7eEeYCCs/VZUr9mY0nuzysq3ltiBW6tsdCn6d89ogs2WvseTlHZLg==
+-----END RSA PRIVATE KEY-----

testing/environments/docker/elasticsearch/pki/generate_pki.sh

@@ -2,4 +2,3 @@
 # Take the certificates and create a DER format and create a sha256 of it and encode it to base 64
 # https://www.openssl.org/docs/manmaster/man1/dgst.html
 openssl x509 -in ca/ca.crt -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
-openssl x509 -in ca/ca.crt -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256