Merge pull request #9 from sourceplusplus/update-docker

update docker deployment

Author: BFergerson

.github/workflows/e2e.yml

@@ -41,6 +41,7 @@ jobs:
         run: |
           until $(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure --output /dev/null --silent --fail https://localhost:12800/health); do printf '.'; sleep 5; done
       - run: curl -sS https://webinstall.dev/jq | bash
+      - run: sleep 30s #wait for services to connect; todo: use health endpoint
 
       - name: Verify probe connected
         run: |

e2e/config/spp-platform.crt

@@ -1,29 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFBTCCAu2gAwIBAgIGAXm19tRjMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNVBAMM
-DnNreXdhbGtpbmctb2FwMB4XDTIxMDUyOTAyMzIwMloXDTIzMDUyOTAyMzIwMlow
-GTEXMBUGA1UEAwwOc2t5d2Fsa2luZy1vYXAwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCMh4NPzjmjwWhsli4mqQCZ089/mJWJtmRXTNkk2eC/MwFdeggp
-CE8hYjHWuZus53Irkn4yzWx95e5iA0XWGmEqJ/yBYIF+DIbIT/XWH+cIdHHz3Yzl
-MCK0Mb/AKOyvJaqavCh5Ln2MGqlQgETv4E4dkHHSi5Bajz3KfiYOhFql6sdZHgr+
-tmLExzAJc6j/3+m2zLOE7C1LQd1IStr+HGNM7b1ykxMvjEcFl6tC0FCTCCg8BEf+
-8JDfZGnC9WGJlN/aBqAM4rZwD2hH/N7c1Aj4ZBKGKd5L1NgYyQUGmf/KT0U5s6bd
-Jucfku+G08b2wxVe134D7TVSbSXAV4QO4dMaemG63cUcsmQQyzto6SSbGbgkhESf
-POAkAOFStuOBhRculYjeDyrEy/nHOfRpk3sVrMmEb+Hao5ddwZy97TfapI1xyMUw
-bD9qdY3numVHezm3K/Br/yuFnbEPswMfmeB8i0LH9iCsemhJ10lrtTgv9W2QPZj0
-Lb4BV/hvrYSoKDBBntg27yZ+pzBU2jnqD8I25i61qKOXd8XbZtXjnZ4LSdQ4H4Lw
-qK6lptk/vnODFbbZZ0o2k8xhOAYN7fKq6wRSrRfggcUuNHWGtAZZpqvkqHy+lYrQ
-9z1UVrNhSq7/0me5FOXiEPZNyE5Hc6QvQdeKR2iFUoRiKViNZesCRktzFwIDAQAB
-o1MwUTAdBgNVHQ4EFgQUJ8G+IdTAqwY4Be8QqpVBWQkW2AAwHwYDVR0jBBgwFoAU
-J8G+IdTAqwY4Be8QqpVBWQkW2AAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAgEAYAriTF5HpA79qC5EQeI/cWkGVllVxwfX74DkxO5gcLesaSOlTwfE
-zofz3i4axtZZ1Zu18N1Ab7AXFDSAxUQzGzbTKTi3vdZAmQ+f9dvrxR1Y2NSdXJqn
-mjSexqlo86jOR7ZGfPePEZEb8EJxHT2Vay4t2DeL6+gVXeqWqGvCGqHaHuzAvW85
-nxGDMDV2vCQs4HQT2NDNN1KzZWd1hZ7gAbPh8fsCY/mE7qOKAr7Oj83GvAwkigRx
-6YIcvvXN2erybsUDdz4KrqZcVjRGFkLZb5G9IerVD8ynat/2d7UlShDs+d+qRQRo
-Ek5+eR4L5ArJi0rz5ipGQgQFVNKZhD6sygAG/LCpl2Qjue85B56uALSiEelLuqvD
-pHwjuKIAuLbhkF4nAVlrx0L+SC5q++uh4E+UbYa8E5Buht2cAVIHvdQuWyiSLR7Y
-/wT53AvdhREC9HHOOKGU7yvWnz1lNj2oESg3GsOqLktjuE/mSj5n77AOx257Buge
-TAOI+4XeV7/RbP1o2EgDqkXJ7grHd7/J2STjKMpcqxYMGunF55PqlZNXVRHBDVet
-fiY1ZdwIbLAQG8BcuFMy/LN7kpEsP+MdcRpjxaSkf5MikOiaopR8CUAum+PgsJQm
-C2qY1tsu3thMz5vcu9iFapWmHJA01y3ClottxY5c5DztQVYJTuZ8T20=
------END CERTIFICATE-----
+MIIFLzCCAxegAwIBAgIGAYG9v8lfMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNVBAMM
+DHNwcC1wbGF0Zm9ybTAeFw0yMjA3MDIwNzExMTFaFw0yMzA3MDIwNzExMTFaMBcx
+FTATBgNVBAMMDHNwcC1wbGF0Zm9ybTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAJglr80YnYGgFu3ZmTqU1ZuYX9Na9W78kYfeEtE/v/LPzXOPCU3duHvI
+q5W5Ev6fvww6iRK32tQmZ84CTr3L5HMIbgKHFHe7TFp+0Eb+2MdqFp1K8dRobUKd
+vehIQsRi5I+I7lq0bQwT7cgysT/+sYUBWr6ZZSIe3Emqn+xHuwX9MXHSNzTRwZzQ
+EYIECbih8Zxa7stxp3wowKB3Z9cLppfJ04JQ5eEXaNrVNUfPZb+eGCEcnPthN5vZ
+WSz0G0OLkEaU5UH8FsvSBrpJmmHRIjEiYUpEITusk/QEPTBGS7nPPyhEvVj75/Q0
+euMUZU7xSQfBblHO3nj/YoskCPCGI7wG7ah1FiXGDq6sfUAeG285CdBYKZYI2gWr
+pPya21L7aOy9qLZw2SJ4HQ92qow9fHV52meDPeuyLJjhzHZoCKuOus0IdjztYJ8p
+bAoZJtsjW9nVh0VCBIYpwkjZzWBsJvCObWJS/UBHKZwNH2sM7DQVqsJQTG2RGxts
+d7GEn9AEzzehjBRQXhW22OH5PkujFw2vu23J6kUw33P5lDUOybAK4Bp10dP+tTzS
+60MjspN+N0ZKcgiYegB0/W7Pkc2pGrmVpmv1F4znCuXkn8nUSqzGZ0eX5ehZZ1Wa
+j4Nc2/WlIvuAdPM/SEn4gzZoZ+FdOQEoZmsDdjOxBwihgeNF3WefAgMBAAGjgYAw
+fjArBgNVHREBAf8EITAfggxzcHAtcGxhdGZvcm2HBH8AAAGCCWxvY2FsaG9zdDAd
+BgNVHQ4EFgQUQYUL1pWw3KzgUXBO+2Gh8mwsSxQwHwYDVR0jBBgwFoAUQYUL1pWw
+3KzgUXBO+2Gh8mwsSxQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AgEAQyBpimXMYDuIEL8PXCab8EzoRfsu+Ot5ZdcwkAE/93H0YnTHr7+79WzTnIcj
+VW/MQ4keDQSljjA6x9Te2+qH2eMFuPPa0X5iXkLQaJro3kaVzi/NWbHkJ2RSemsw
+6lqx0G0f1ojoIXcgmurwlTRyoU/5wikX2WTS8VSA9Tylv5K6nYXaEU5eMCCdt9rI
+5RQGMatQDNPmwJCgwkW2+zpDJTBSPl7i7qym5+ljCKD+Vuawq9SRTU1I3BZXB1bN
+LdlZLrCbnM9nSW64oXG7X5h2t2N8PifCg/kwiE5UHO9snv1a6bjHyVyBXOhS4zJT
+JhM8i8911uCaxc6e+fBknT4t2V7DET3MCxUQ2fvJ75JgBD3OPo6qcpdOwWwrQiyC
+nITRe+LLhZQfyIsfbXoNE930uFNQvoYoHIovrOm6nUPCzBRx9YOZpdOkbYi3V6tA
+ooUtSLrQVO++tk4pZsvLRwZ5Yku+/J/nzjYDk+dtCxd5bM3vHAfhEjzvijouVCA3
++7VjhiWpBSNeUt7ENX9s2GGs0OjUCAoOFoOENDcZdu7u9hrzUIhHsFGTyL0DQ1lT
+Ip40RbmWHOunjHYEZRbJhB2Mo+hcIMGpARIq3WSYQFZnxBbchqnUnVvvo/bE5yB8
+g6TYnkFuMFHg/LvA7RX1v2Xha5YSEHBBV7V2emBmZc1Tpkk=
+-----END CERTIFICATE-----

e2e/config/spp-platform.key

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

e2e/docker-compose.yml

@@ -6,10 +6,10 @@ services:
       context: .
     depends_on:
       - spp-platform
-      - skywalking-oap
     links:
       - spp-platform
-      - skywalking-oap
+    ports:
+      - "5000:5000"
     environment:
       - SPP_PLATFORM_HOST=spp-platform
       - SPP_OAP_HOST=skywalking-oap
@@ -21,34 +21,18 @@ services:
     ports:
       - "5450:5450"
       - "5455:5455"
+      - "11800:11800"
+      - "11801:11801" #todo: shouldn't be necessary
       - "12800:12800"
     environment:
       - SPP_LOGGING_LEVEL=trace
-      - SPP_OAP_HOST=skywalking-oap
-    volumes:
-      - ./config/spp-platform.crt:/opt/sourceplusplus/config/spp-platform.crt
-      - ./config/spp-platform.key:/opt/sourceplusplus/config/spp-platform.key
-  skywalking-oap:
-    image: sourceplusplus/spp-oap-server:latest
-    container_name: skywalking-oap
-    hostname: skywalking-oap
-    ports:
-      - "11800:11800"
-    depends_on:
-      - spp-platform
-    links:
-      - spp-platform
-    environment:
-      - SPP_PLATFORM_HOST=spp-platform
-      - SPP_PLATFORM_PORT=5460
-      - SPP_PLATFORM_CERTIFICATE_FILE=/skywalking/spp-platform.crt
       - SW_CORE_GRPC_SSL_ENABLED=true
-      - SW_CORE_GRPC_SSL_KEY_PATH=/skywalking/spp-platform.key
-      - SW_CORE_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/spp-platform.crt
-      - SW_CORE_GRPC_SSL_TRUSTED_CA_PATH=/skywalking/spp-platform.crt
+      - SW_CORE_GRPC_SSL_KEY_PATH=/skywalking/config/spp-platform.key
+      - SW_CORE_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/config/spp-platform.crt
+      - SW_CORE_GRPC_SSL_TRUSTED_CA_PATH=/skywalking/config/spp-platform.crt
       - SW_RECEIVER_GRPC_SSL_ENABLED=true
-      - SW_RECEIVER_GRPC_SSL_KEY_PATH=/skywalking/spp-platform.key
-      - SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/spp-platform.crt
+      - SW_RECEIVER_GRPC_SSL_KEY_PATH=/skywalking/config/spp-platform.key
+      - SW_RECEIVER_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/config/spp-platform.crt
     volumes:
-      - ./config/spp-platform.crt:/skywalking/spp-platform.crt
-      - ./config/spp-platform.key:/skywalking/spp-platform.key
+      - ./config/spp-platform.crt:/skywalking/config/spp-platform.crt
+      - ./config/spp-platform.key:/skywalking/config/spp-platform.key

e2e/spp-probe.yml

@@ -3,7 +3,35 @@ spp:
   platform_port: 5450
   quiet_mode: false
   verify_host: false
-  platform_certificate: "MIIFBTCCAu2gAwIBAgIGAXm19tRjMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNVBAMMDnNreXdhbGtpbmctb2FwMB4XDTIxMDUyOTAyMzIwMloXDTIzMDUyOTAyMzIwMlowGTEXMBUGA1UEAwwOc2t5d2Fsa2luZy1vYXAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCMh4NPzjmjwWhsli4mqQCZ089/mJWJtmRXTNkk2eC/MwFdeggpCE8hYjHWuZus53Irkn4yzWx95e5iA0XWGmEqJ/yBYIF+DIbIT/XWH+cIdHHz3YzlMCK0Mb/AKOyvJaqavCh5Ln2MGqlQgETv4E4dkHHSi5Bajz3KfiYOhFql6sdZHgr+tmLExzAJc6j/3+m2zLOE7C1LQd1IStr+HGNM7b1ykxMvjEcFl6tC0FCTCCg8BEf+8JDfZGnC9WGJlN/aBqAM4rZwD2hH/N7c1Aj4ZBKGKd5L1NgYyQUGmf/KT0U5s6bdJucfku+G08b2wxVe134D7TVSbSXAV4QO4dMaemG63cUcsmQQyzto6SSbGbgkhESfPOAkAOFStuOBhRculYjeDyrEy/nHOfRpk3sVrMmEb+Hao5ddwZy97TfapI1xyMUwbD9qdY3numVHezm3K/Br/yuFnbEPswMfmeB8i0LH9iCsemhJ10lrtTgv9W2QPZj0Lb4BV/hvrYSoKDBBntg27yZ+pzBU2jnqD8I25i61qKOXd8XbZtXjnZ4LSdQ4H4LwqK6lptk/vnODFbbZZ0o2k8xhOAYN7fKq6wRSrRfggcUuNHWGtAZZpqvkqHy+lYrQ9z1UVrNhSq7/0me5FOXiEPZNyE5Hc6QvQdeKR2iFUoRiKViNZesCRktzFwIDAQABo1MwUTAdBgNVHQ4EFgQUJ8G+IdTAqwY4Be8QqpVBWQkW2AAwHwYDVR0jBBgwFoAUJ8G+IdTAqwY4Be8QqpVBWQkW2AAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAYAriTF5HpA79qC5EQeI/cWkGVllVxwfX74DkxO5gcLesaSOlTwfEzofz3i4axtZZ1Zu18N1Ab7AXFDSAxUQzGzbTKTi3vdZAmQ+f9dvrxR1Y2NSdXJqnmjSexqlo86jOR7ZGfPePEZEb8EJxHT2Vay4t2DeL6+gVXeqWqGvCGqHaHuzAvW85nxGDMDV2vCQs4HQT2NDNN1KzZWd1hZ7gAbPh8fsCY/mE7qOKAr7Oj83GvAwkigRx6YIcvvXN2erybsUDdz4KrqZcVjRGFkLZb5G9IerVD8ynat/2d7UlShDs+d+qRQRoEk5+eR4L5ArJi0rz5ipGQgQFVNKZhD6sygAG/LCpl2Qjue85B56uALSiEelLuqvDpHwjuKIAuLbhkF4nAVlrx0L+SC5q++uh4E+UbYa8E5Buht2cAVIHvdQuWyiSLR7Y/wT53AvdhREC9HHOOKGU7yvWnz1lNj2oESg3GsOqLktjuE/mSj5n77AOx257BugeTAOI+4XeV7/RbP1o2EgDqkXJ7grHd7/J2STjKMpcqxYMGunF55PqlZNXVRHBDVetfiY1ZdwIbLAQG8BcuFMy/LN7kpEsP+MdcRpjxaSkf5MikOiaopR8CUAum+PgsJQmC2qY1tsu3thMz5vcu9iFapWmHJA01y3ClottxY5c5DztQVYJTuZ8T20="
+  platform_certificate: |
+    MIIFLzCCAxegAwIBAgIGAYG9v8lfMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNVBAMM
+    DHNwcC1wbGF0Zm9ybTAeFw0yMjA3MDIwNzExMTFaFw0yMzA3MDIwNzExMTFaMBcx
+    FTATBgNVBAMMDHNwcC1wbGF0Zm9ybTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+    AgoCggIBAJglr80YnYGgFu3ZmTqU1ZuYX9Na9W78kYfeEtE/v/LPzXOPCU3duHvI
+    q5W5Ev6fvww6iRK32tQmZ84CTr3L5HMIbgKHFHe7TFp+0Eb+2MdqFp1K8dRobUKd
+    vehIQsRi5I+I7lq0bQwT7cgysT/+sYUBWr6ZZSIe3Emqn+xHuwX9MXHSNzTRwZzQ
+    EYIECbih8Zxa7stxp3wowKB3Z9cLppfJ04JQ5eEXaNrVNUfPZb+eGCEcnPthN5vZ
+    WSz0G0OLkEaU5UH8FsvSBrpJmmHRIjEiYUpEITusk/QEPTBGS7nPPyhEvVj75/Q0
+    euMUZU7xSQfBblHO3nj/YoskCPCGI7wG7ah1FiXGDq6sfUAeG285CdBYKZYI2gWr
+    pPya21L7aOy9qLZw2SJ4HQ92qow9fHV52meDPeuyLJjhzHZoCKuOus0IdjztYJ8p
+    bAoZJtsjW9nVh0VCBIYpwkjZzWBsJvCObWJS/UBHKZwNH2sM7DQVqsJQTG2RGxts
+    d7GEn9AEzzehjBRQXhW22OH5PkujFw2vu23J6kUw33P5lDUOybAK4Bp10dP+tTzS
+    60MjspN+N0ZKcgiYegB0/W7Pkc2pGrmVpmv1F4znCuXkn8nUSqzGZ0eX5ehZZ1Wa
+    j4Nc2/WlIvuAdPM/SEn4gzZoZ+FdOQEoZmsDdjOxBwihgeNF3WefAgMBAAGjgYAw
+    fjArBgNVHREBAf8EITAfggxzcHAtcGxhdGZvcm2HBH8AAAGCCWxvY2FsaG9zdDAd
+    BgNVHQ4EFgQUQYUL1pWw3KzgUXBO+2Gh8mwsSxQwHwYDVR0jBBgwFoAUQYUL1pWw
+    3KzgUXBO+2Gh8mwsSxQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+    AgEAQyBpimXMYDuIEL8PXCab8EzoRfsu+Ot5ZdcwkAE/93H0YnTHr7+79WzTnIcj
+    VW/MQ4keDQSljjA6x9Te2+qH2eMFuPPa0X5iXkLQaJro3kaVzi/NWbHkJ2RSemsw
+    6lqx0G0f1ojoIXcgmurwlTRyoU/5wikX2WTS8VSA9Tylv5K6nYXaEU5eMCCdt9rI
+    5RQGMatQDNPmwJCgwkW2+zpDJTBSPl7i7qym5+ljCKD+Vuawq9SRTU1I3BZXB1bN
+    LdlZLrCbnM9nSW64oXG7X5h2t2N8PifCg/kwiE5UHO9snv1a6bjHyVyBXOhS4zJT
+    JhM8i8911uCaxc6e+fBknT4t2V7DET3MCxUQ2fvJ75JgBD3OPo6qcpdOwWwrQiyC
+    nITRe+LLhZQfyIsfbXoNE930uFNQvoYoHIovrOm6nUPCzBRx9YOZpdOkbYi3V6tA
+    ooUtSLrQVO++tk4pZsvLRwZ5Yku+/J/nzjYDk+dtCxd5bM3vHAfhEjzvijouVCA3
+    +7VjhiWpBSNeUt7ENX9s2GGs0OjUCAoOFoOENDcZdu7u9hrzUIhHsFGTyL0DQ1lT
+    Ip40RbmWHOunjHYEZRbJhB2Mo+hcIMGpARIq3WSYQFZnxBbchqnUnVvvo/bE5yB8
+    g6TYnkFuMFHg/LvA7RX1v2Xha5YSEHBBV7V2emBmZc1Tpkk=
 skywalking:
   logging:
     level: "INFO"
@@ -12,8 +40,8 @@ skywalking:
     class_cache_mode: "FILE"
     service_name: "spp"
   collector:
-    backend_service: "skywalking-oap:11800"
+    backend_service: "spp-platform:11801"
   plugin:
     toolkit:
       log:
-        transmit_formatted: false
+        transmit_formatted: false

sourceplusplus/SourcePlusPlus.py

@@ -63,12 +63,11 @@ def __init__(self, args: dict = None):
             "SPP_SERVICE_NAME", probe_config["skywalking"]["agent"].get("service_name"), "spp"
         )
 
-        skywalking_host = self.get_config_value("SPP_OAP_HOST", "localhost", "localhost")
         skywalking_port = self.get_config_value("SPP_OAP_PORT", 11800, 11800)
         probe_config["skywalking"]["collector"]["backend_service"] = self.get_config_value(
             "SPP_SKYWALKING_BACKEND_SERVICE",
             probe_config["skywalking"]["collector"].get("backend_service"),
-            skywalking_host + ":" + str(skywalking_port)
+            probe_config["spp"]["platform_host"] + ":" + str(skywalking_port)
         )
 
         for key, val in args.items():