From e137e398f600584b7264e09c639950abd4cbe0cb Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 11 Jun 2018 14:57:39 +0200 Subject: [PATCH 01/37] From fork --- .drone.yml | 20 ++++++++ .gitignore | 16 ++---- Dockerfile | 10 ++-- configs/production/burrow/burrow.toml | 72 +++++++++++++++++++++++++++ gygservice.yml | 11 ++++ 5 files changed, 112 insertions(+), 17 deletions(-) create mode 100644 .drone.yml create mode 100644 configs/production/burrow/burrow.toml create mode 100644 gygservice.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 00000000..5dfa628e --- /dev/null +++ b/.drone.yml @@ -0,0 +1,20 @@ +# This file was generated by gygdev. Do not manually modify it +pipeline: + build-image: + image: hub.gyg.io/drone-plugins/gyg-registry + privileged: true + context: . + dockerfile: ./Dockerfile + repo: hub.gyg.io/devops/burrow + tags: + - ${DRONE_BUILD_NUMBER}.${DRONE_COMMIT_SHA:0:7} + when: + event: push + register-dss: + image: hub.gyg.io/drone-plugins/dss + privileged: true + repo: hub.gyg.io/devops/burrow + tags: + - ${DRONE_BUILD_NUMBER}.${DRONE_COMMIT_SHA:0:7} + when: + event: push diff --git a/.gitignore b/.gitignore index f0208c50..d054eddb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,4 @@ -burrow-src -.*.swp -!config -dist -log -.idea -*.cov -Burrow -Burrow.exe -Burrow.iml -tmp -vendor +/.gygdev-dc.yml +/.gygdev_generated +/.config +/.secrets diff --git a/Dockerfile b/Dockerfile index 4a309024..6f2e7eb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,14 @@ FROM golang:1.11-alpine as builder ENV DEP_VERSION="0.5.0" RUN apk add --no-cache git curl gcc libc-dev && \ - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep && \ - chmod +x $GOPATH/bin/dep && \ - mkdir -p $GOPATH/src/github.com/linkedin/Burrow + curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep && \ + chmod +x $GOPATH/bin/dep && \ + mkdir -p $GOPATH/src/github.com/linkedin/Burrow ADD . $GOPATH/src/github.com/linkedin/Burrow/ RUN cd $GOPATH/src/github.com/linkedin/Burrow && \ - dep ensure && \ - go build -o /tmp/burrow . + dep ensure && \ + go build -o /tmp/burrow . FROM iron/go LABEL maintainer="LinkedIn Burrow https://github.com/linkedin/Burrow" diff --git a/configs/production/burrow/burrow.toml b/configs/production/burrow/burrow.toml new file mode 100644 index 00000000..7b2db577 --- /dev/null +++ b/configs/production/burrow/burrow.toml @@ -0,0 +1,72 @@ +# https://github.com/linkedin/Burrow/wiki/Configuration + +[general] +pidfile="burrow.pid" +# stdout-logfile="burrow.out" +access-control-allow-origin="burrow.frankfurt1.gygkube.com" + +[logging] +# filename="logs/burrow.log" +level="info" +# maxsize=100 +# maxbackups=30 +# maxage=10 +use-localtime=false +# use-compression=true + +[zookeeper] +servers=[ "zookeeper1.kafka1.gygkube.com:2181" ] +timeout=6 +root-path="/burrow" + +[client-profile.kafka1] +client-id="burrow-test" +kafka-version="1.1.0" +sasl="kafka1" + +[cluster.kafka1] +class-name="kafka" +servers=[ "kafka1.kafka1.frankfurt1.com:9092" ] +client-profile="kafka1" +topic-refresh=120 +offset-refresh=30 + +[consumer.kafka1] +class-name="kafka" +cluster="kafka1" +servers=[ "kafka1.kafka1.frankfurt1.com:9092" ] +client-profile="kafka1" +group-blacklist="^(console-consumer-|python-kafka-consumer-|quick-|devops).*$" +group-whitelist="" + +[consumer.kafka1_zk] +class-name="kafka_zk" +cluster="kafka1" +servers=[ "zookeeper1.kafka1.gygkube.com:2181" ] +zookeeper-path="/burrow" +zookeeper-timeout=30 +group-blacklist="^(console-consumer-|python-kafka-consumer-|quick-|devops).*$" +group-whitelist="" + +[httpserver.default] +address=":8000" + +[storage.default] +class-name="inmemory" +workers=20 +intervals=15 +expire-group=604800 +min-distance=1 + +# [notifier.default] +# class-name="http" +# url-open="http://someservice.example.com:1467/v1/event" +# interval=60 +# timeout=5 +# keepalive=30 +# extras={ api_key="REDACTED", app="burrow", tier="STG", fabric="mydc" } +# template-open="conf/default-http-post.tmpl" +# template-close="conf/default-http-delete.tmpl" +# method-close="DELETE" +# send-close=true +# threshold=1 diff --git a/gygservice.yml b/gygservice.yml new file mode 100644 index 00000000..e9e5829b --- /dev/null +++ b/gygservice.yml @@ -0,0 +1,11 @@ +version: '1' +service: + name: burrow + owner: devops + containers: + web: + dockerfile: Dockerfile + needs: + - kafka + config_files: + burrow: template:/etc/burrow/ From c0e5a0b557da0d916b7ec4f2cd5cfd940e5336ab Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 11 Jun 2018 15:16:35 +0200 Subject: [PATCH 02/37] Add sasl config --- configs/production/burrow/burrow.toml | 5 +++++ configs/production/burrow/sasl.toml | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 configs/production/burrow/sasl.toml diff --git a/configs/production/burrow/burrow.toml b/configs/production/burrow/burrow.toml index 7b2db577..70583306 100644 --- a/configs/production/burrow/burrow.toml +++ b/configs/production/burrow/burrow.toml @@ -58,6 +58,11 @@ intervals=15 expire-group=604800 min-distance=1 +[sasl.kafka1] +username="${SASL_PLAIN_USERNAME}" +password="${SASL_PLAIN_PASSWORD}" +handshake-first=false + # [notifier.default] # class-name="http" # url-open="http://someservice.example.com:1467/v1/event" diff --git a/configs/production/burrow/sasl.toml b/configs/production/burrow/sasl.toml new file mode 100644 index 00000000..abbf0ebd --- /dev/null +++ b/configs/production/burrow/sasl.toml @@ -0,0 +1,4 @@ +[sasl.kafka1] +username="${SASL_PLAIN_USERNAME}" +password="${SASL_PLAIN_PASSWORD}" +handshake-first=false From 163f1c5b6728713af211670797eedf85668c18ad Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 11 Jun 2018 15:40:17 +0200 Subject: [PATCH 03/37] Sasl as dedicated secret --- configs/production/burrow/sasl.toml | 4 ---- gygservice.yml | 4 +++- secrets/production/sasl.json | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 configs/production/burrow/sasl.toml create mode 100644 secrets/production/sasl.json diff --git a/configs/production/burrow/sasl.toml b/configs/production/burrow/sasl.toml deleted file mode 100644 index abbf0ebd..00000000 --- a/configs/production/burrow/sasl.toml +++ /dev/null @@ -1,4 +0,0 @@ -[sasl.kafka1] -username="${SASL_PLAIN_USERNAME}" -password="${SASL_PLAIN_PASSWORD}" -handshake-first=false diff --git a/gygservice.yml b/gygservice.yml index e9e5829b..f2e0ce94 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -8,4 +8,6 @@ service: needs: - kafka config_files: - burrow: template:/etc/burrow/ + burrow: template:/etc/burrow/config/ + secret_files: + sasl: /etc/burrow/secrets/ diff --git a/secrets/production/sasl.json b/secrets/production/sasl.json new file mode 100644 index 00000000..97ab108e --- /dev/null +++ b/secrets/production/sasl.json @@ -0,0 +1,9 @@ +{ + "data": { + "sasl.toml": { + "iv": "sEZv0pZY7nbI+U3LZudPyA==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEOHb9EBPFb9IEDsNR7Fj87AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMkLZ9JqCUW6h9Cu1KAgEQgDu9H0rqYruW/TvXJrWP+MEP60fG9p2zJi7GQ/yG8+olUGbzsF+3bvPpSUjJkKFxSH/GXJWi3gj+cW3fPg==", + "data": "W4CWiKHgP9qsuSF8CEeZODI2XTXG23egf4LojHeELQeZ3pDpeDH/8GwFf5S+jNh1x4vOeJUHPsYEwKuWenSpshRvz7o0Ry9IU78dCW5sxjXq01jo2i30tEsmlNjbO6hx" + } + } +} \ No newline at end of file From 1faa55c1d4c3a452adcbb594fd71860619e6873b Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 11 Jun 2018 16:03:21 +0200 Subject: [PATCH 04/37] Whole config in secret --- gygservice.yml | 6 +++--- secrets/production/sasl.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index f2e0ce94..6c22fd23 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -7,7 +7,7 @@ service: dockerfile: Dockerfile needs: - kafka - config_files: - burrow: template:/etc/burrow/config/ + # config_files: + # burrow: template:/etc/burrow/config/ secret_files: - sasl: /etc/burrow/secrets/ + sasl: /etc/burrow/ diff --git a/secrets/production/sasl.json b/secrets/production/sasl.json index 97ab108e..4a5e34c8 100644 --- a/secrets/production/sasl.json +++ b/secrets/production/sasl.json @@ -1,9 +1,9 @@ { "data": { "sasl.toml": { - "iv": "sEZv0pZY7nbI+U3LZudPyA==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEOHb9EBPFb9IEDsNR7Fj87AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMkLZ9JqCUW6h9Cu1KAgEQgDu9H0rqYruW/TvXJrWP+MEP60fG9p2zJi7GQ/yG8+olUGbzsF+3bvPpSUjJkKFxSH/GXJWi3gj+cW3fPg==", - "data": "W4CWiKHgP9qsuSF8CEeZODI2XTXG23egf4LojHeELQeZ3pDpeDH/8GwFf5S+jNh1x4vOeJUHPsYEwKuWenSpshRvz7o0Ry9IU78dCW5sxjXq01jo2i30tEsmlNjbO6hx" + "iv": "ziC3GfoIWK5QK/oibhBkbw==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGdABfFFCFHTaZm3yRf5yCiAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM6VXURDeVa9gqi/aXAgEQgDv78jzMzJje+rdWYSgnbVFAzkkes2G8QbNNhbZfxSz8F4fA+Md7ar6x0QZ8VXuLcOYd330gAESFABf6zA==", + "data": "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" } } } \ No newline at end of file From ff184b5064e7a72d068c04bde3fc25c31adee326 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 09:28:21 +0200 Subject: [PATCH 05/37] Rename secret file --- gygservice.yml | 2 +- secrets/production/burrow.json | 9 +++++++++ secrets/production/sasl.json | 9 --------- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 secrets/production/burrow.json delete mode 100644 secrets/production/sasl.json diff --git a/gygservice.yml b/gygservice.yml index 6c22fd23..6de11676 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -10,4 +10,4 @@ service: # config_files: # burrow: template:/etc/burrow/config/ secret_files: - sasl: /etc/burrow/ + burrow: /etc/burrow/ diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json new file mode 100644 index 00000000..81fbfb1c --- /dev/null +++ b/secrets/production/burrow.json @@ -0,0 +1,9 @@ +{ + "data": { + "burrow.toml": { + "iv": "pKyUJnuUUxwpyE8ITKhBkg==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwFbItaaID3t56D5D6/oYaQqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM+xRSheLOA3u+xGWCAgEQgDt3K11Vr67zU8CLuc0ovzPS0RnSTCs75T3L9HeK6YFWu63HhPS7G0jS6d8deVfJG0qaOKRvbzgMSIwMHQ==", + "data": "0cQHTKEz/EFk0uBeKUvxfc9nXufbDsWnZ+ps1eLryuUa5ltBI00YPn6kyuzG0zNwMjjgWuGVPmAmLW9nH1BOyjgyzw8t7tVUcbTIVLcNHLh6LHDtCmi2P7w5hbii5P+KRPXXChR2WspdswW+jNnJqMwHOCzDwPJPk6L8dpM8z6Dk8/peeIu+slR/dn7e6QXwFv8ERyBjOMonpUDF9eNy/G31vRLy0ycUQswmRD4/S191j8Pq9yq8zutxymzGuXTJLBqqHXtzq5JrddxRiwL1uTIz0z9CrLMN68nC3pYeV7xAxdgDrc+JhFkmvGN8HzM0uj0kbSvNh7mfAvVGoS4R+oAZopM0afIW77ITkHb4dbHuI/bZxZGaz5i5u53Hx15pNUxI1RQXRB9Qcai51zOrT+EQXPGaHVyEQhZyJvNoaZ7fBu4AuGOS6HFBaxVlMT/vwxpiFdng9tZeW7wDLITocMH/tbofgSgXJyLrdikmxY0xCN/LThCh9/kWhU/yer+d9PLrfle37jNs9ccW7SM3e3f0yUvk2sH//tIQmYqcvcPJ83E3Exo9yO4fTaUgaIu3kBViVDwxl/R+6d4vMiKd8zqViSMeWqL6hhE9jcpYxMBMhjVEMsOHXTTRrdciO1oKyn4GlpYFrj5kOR4xhLzeVdqcnLFGFO5f+jtioAcXArfR+qwfYbCRm8lh05sgz4NSX+9Oa8lsCzlwsnKp8/VWONPoxrSFA2CnzlwBIgG0oI8fpWtfJUyCb38XnGYoqCO0R+5epNtYx87HVcoLhRaMzipn9GCN72xuZQ51HtKFVa2tCkIRZ8Qt1cc71cm1DbRyDlsMR3+BKQDao8MDYNfeROpS46A0f4ng7IEsympj/yfSVUg1Mx1NUmXHiJdojFGCxsbHNCaasH0V4Ki30B/eEi0dQzE5X14JyvWbLR8Sc/tZ0SQOI2RdOMfU9SE5Y8vSmoHTM01NZ8xpVVQRqhQTGPeV6Kd8SFCSKBBb2/I5kJ9SvUXNDMYc+64CPW2y7gN4dYe8vLA0Pk6V1G6Bj6wTX81dLOiYdkO8bW81cZtQ0BFCz5rkXBig67XxFFWB4GnfNwBrHIqKSIge5ilUapK5oxM4ZX/FK7Ej/cy+nzFBp4hhtU4DIQuN2pAAfx2qyYpXy9s1ZVlMMUmByda4/KrJjD539qQkoQobgUi1+FkZF+PRtBa0iMnaOClBX62HasWtJ8vezF+ujXAXaWFBkqltFTl4QDkkQbZm+MWvXs1J5rcGLEknro9oWmzrjIhgnSu1cnHzNj9xuJSC1mOrWd8ip7kahE2aaxywn0ZyNa1JR8ceYlYEB9nyqia9YLGxJ1Srm9zj8PUKzV4uhDkZx8nVBe5UHdwPPtbhJgByxWWcjjELmq5y6Tfw63+cwu1Z4ivE3+LQ2cu+llUyWzhznAnHLqct1aYOPcNyoU+wSL2JvEk5CyGXUd8tf+Q64K1XRtICqg09cTZBMAyOApZylfTz1elNfUzgX8lbigStcXLkkVxGVFhha52ylfV9KOckNpNuexhc6TdNxHj+FKfS8/apwKfPb1UFEFkFSCvtF4hvHvYBsCmMhHya4pG+nUU6O+rbJbTmo5QA3zir0h5/w5vpgq/YGphAlmvZt8mbPstL73Zw2g/WqMxvVDeMmCy04jmF6yBQrdXV16fZF6/PoXGzqKzqulpOHAL0na1LUT5o9cxenxzXIx+GbAOusGbUw73phzIfP3mgsvmrSNhWGM0ggdchbm1u6kxdSytggeyTaVeGJDDsVQe+k+VVOAFqbtuiv5cO4/uTC2JbAX6dRTIsN+BkT8FT4hm9foeSp5VYERGIbxHCs9NErvBM2BsT25uXExiRN8dg6XOnPrAjhzjuM8vcziBlBYnsTA458K+TXSO+KkEOLkQMcIMSVQhDnyj126dQZ+n1kxwzlgbx9tTExwqL4KqqHigm5e0Y5OO5XT0msURNktaPiB9E67WBpBSYbbiNmpcopXBE/j4I0cMr+LJ8uJsIjB/Co6Jsvmr9uj9kHLsTvB/cmEi1brNIKSm3hEQbe8suiHeQDZ7B2ikn4UFRugFWvl+lwrLlggZRpkkpbu1sj1Yvm4c60AHj850qY74twowMk2l4q1uUDu+Swl/XYIgOqI08ekkokXTVEvp+7XDWXuwdPjSAD9qUp9hq/nI3b1N/KBMHVwbbJZEyjCcchwU98pXhzudfKaRcnsyVPHY2j++jWUE6sRyYrx4E312GIWhzlXXxdt5dSGhA9OXZWcw/aZ1LE3VCmLKL11A1bMO4xsRL3ONX7m8byaTVlRFusO+QTV6/M1vAn1ioPVkZ1Tgd9a98N/+jB4ROp9yMwzTl5C+tKeCfvW/LePnEMUAoOAqJGE/it0/d/liyK/REF9OLVJyAy2IwHw3SYunvg9WXo48l9KYyh3l1QJJm" + } + } +} diff --git a/secrets/production/sasl.json b/secrets/production/sasl.json deleted file mode 100644 index 4a5e34c8..00000000 --- a/secrets/production/sasl.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "data": { - "sasl.toml": { - "iv": "ziC3GfoIWK5QK/oibhBkbw==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGdABfFFCFHTaZm3yRf5yCiAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM6VXURDeVa9gqi/aXAgEQgDv78jzMzJje+rdWYSgnbVFAzkkes2G8QbNNhbZfxSz8F4fA+Md7ar6x0QZ8VXuLcOYd330gAESFABf6zA==", - "data": "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" - } - } -} \ No newline at end of file From 5f84f341f674b66bcd8424d2fb8b3192aafb694a Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 09:38:37 +0200 Subject: [PATCH 06/37] Fix secrets --- secrets/production/burrow.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 81fbfb1c..57bd3e78 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "pKyUJnuUUxwpyE8ITKhBkg==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwFbItaaID3t56D5D6/oYaQqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM+xRSheLOA3u+xGWCAgEQgDt3K11Vr67zU8CLuc0ovzPS0RnSTCs75T3L9HeK6YFWu63HhPS7G0jS6d8deVfJG0qaOKRvbzgMSIwMHQ==", - "data": "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" + "iv": "hzd14GC0CUYBd9cHh1D9Dg==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGrmJkO5rame7rbXB9MQJuvAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM8MMlH6qcbdCTkiasAgEQgDtmoD9kXnW91G9joWKO8WVrAvdQ+BV/hjP46lnii1u7LLtMkVpp4qI09Kq4/2HxINkNHAzGCrWmAPRRRg==", + "data": "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" } } -} +} \ No newline at end of file From 219fd7dd0f16755c19a33fe3fec11ec13496ffcd Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 10:05:56 +0200 Subject: [PATCH 07/37] Update kafka endpoint --- secrets/production/burrow.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 57bd3e78..75b9cddf 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "hzd14GC0CUYBd9cHh1D9Dg==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGrmJkO5rame7rbXB9MQJuvAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM8MMlH6qcbdCTkiasAgEQgDtmoD9kXnW91G9joWKO8WVrAvdQ+BV/hjP46lnii1u7LLtMkVpp4qI09Kq4/2HxINkNHAzGCrWmAPRRRg==", - "data": "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" + "iv": "o/F+5gtusM6rXWviv9IJww==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwETgc9xBKb2YdmJPqFHlI8dAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMYwjcdmTH0A70RLsTAgEQgDsOA7fK/+HYyi99B3x5TUMu8+Nasf/7rDC1o1msoeNZOOSRRMMpIVanGl+cYTZ72mGGijJWOSD+lCQPrQ==", + "data": "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" } } } \ No newline at end of file From 7900c67028d323197f12ba9a115bf4e6a31bfb26 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 10:14:21 +0200 Subject: [PATCH 08/37] Sete logging to debug level --- secrets/production/burrow.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 75b9cddf..1167c591 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "o/F+5gtusM6rXWviv9IJww==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwETgc9xBKb2YdmJPqFHlI8dAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMYwjcdmTH0A70RLsTAgEQgDsOA7fK/+HYyi99B3x5TUMu8+Nasf/7rDC1o1msoeNZOOSRRMMpIVanGl+cYTZ72mGGijJWOSD+lCQPrQ==", - "data": "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" + "iv": "iXTe3b+2piDcFw1vVxoBdg==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGUEvuiUbBJzimKUWhk0DVtAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMFq/dT7LFrNmLbm4RAgEQgDsA2OIYSRmqsgnC6cGJECPJ8qgNsd5bqSAj6L567KIgUpEmL22+EfkmSrkhXSPoSxq/tI2K0qUDv6iYlw==", + "data": "oU4AgGpRdboUJQJzsmoCFZmfO4i9HCDnZW8d6/YHUsT7m6KCbF39j5fnjo8zxi1r/enz0BhwyoF+6Vqloe8BbPDnaJBHN19zSdybqrKzAMIF500LVUl0KfVR+QRAobbEyPNtBIAQW4D1YF2OU9xxGmonE/ZGjeMtI6/zAEwKXE+92UpaaV0zvDGD9dhfp5QyLNPVcBH5zfi8bnpaGlE2N4vJquIwZ1FtWf43DzbMMPmdGK9F5p7gX3vz59fU/vwj9A6ksT38hDG0qhZxhBBLB9dFKJUIqjmyZQyuTComWqXCQTc9Wt9EaEIb/y8JfCVRGy2dAj+lKS3zayQXhOnNU7VF9M8XHaAeESDAwiwO3iU0peQGIfrFsvAQpCLKGdeKRxgXRc4Rzu2CkjLbQqtR3lsmaNOoAj7Fr9aYkxA5DdP+6HUttcKj1RgGvmnu/vvhvGsrKdlYpw7nAVzKGtSgMuuC/QSw53Amj72VJNd1cJfO12DOjR2rH5pYnDKQj4fQTBTS1K9xy4I9TCOxOo+Wf1hWb3RozH+no9BgYyXHH8gxB0cHn8owpJC3EWI5BPm+gBfxRkTtz0MxJ8pRGkD3MqgtMEH0lRnVZsQ5lieQGwPwVwukxpqUBMVFCK7GbikhqQ/uLrHyzbGwYwaDQib7QGXrUNcwVAo8ClHjn0F7W1DpFDNlzdBgGrqQDPtJj8SSKlqMDN8QtFjYlZaf79hgG4VRlL6Jop9E2GWKg3Kur/GmQH5v/sdagLv7AqROHvCZ1MnT/ZQ51WRFP+QvIhJlZJSPBu+LIwHe3oXp5ALjER/QzyVTeXzjneKg6lJcCVLamgEbT+u2h+jRzW/SUJ2t6Il4u1vi6CyKACIw6quK8RWry6jiIOSNIlc1b5tfIIMpB6Brf7sEV/5hlpcJHTLI/z9RzJROyDucscJchYP40BVwLAYKzXjJKG52YcNmU1pY0QpUYZgjo7kcYSc84waH6HHBw5Cnp55a/2hkPLJEXDEIUsZu1JyAbczMqX5M7e37+7ftOyujthR+vn8t7hQx+iWVusTiaW7KktBqpUAazh1lNJokqT8762sBaIgW5x8kCvnzMrHGIB/isR35l2wV5PtmA6PNQ55OGaFuJ3tDbNuM2b+clJ5s8HI2E5ltGcuTHIcdB38NU7tbmrLKU+xhq8shoSGq+sF3/FCHxgKqTv2+gG+zu5u1p/lOawD5ez9+gsGMkmVuCSuc8Z4IzD74jzuHLZzyO3KjuW1BgezzJHXtG+Q1QH43r18vDdFqDMu9RXsJxEET8+7xfGq7oKyXw2KDuEk/l8RC9l1aMMnpLXyJIJlvVvghXwRiJIlfYzoyJ6w3l1dhakk3doFsaUDxx6A0ZiDfmJUdMefA6ocxYOYKv/+OyYBle7PLfqKxkrrZWciLLoCISsYPItlkyCTNDL+HL9Gg6aK3aJMAZL8+h7SOuOdCoCzudxuw8cUSCrBlUjpJeT/wfKwB7gU/2cGZBUMSIcrH5GDsrqWEMT3Q7JI8TilJ5x5RJplRxg1kvao0UAGBWGWVliUJWQDSfR3Zqpa830Ky1iYCc/mQLzXBeWqufgHuhB6Ew57jcFXvyivxHDsnpE/EPja+JEI5SalxyFfygmj1BExtTKU6niJXfsIcIkYb7LzctIyQFOzfD4GJtTxjqQVnhHst9aFsiLXhauewc5ROd42nw58Zf5f0RuskB5MHOowTOpD186EBIPGpSARgp4SadYRrW2s6a0EQCcI/pDvnnZ2tVC/h2dBW08LXK0BudEVNxsJf+Hcm20zlOjfx1jsjgTCG/xzTwA9cnorvvC28vtfE6bZNpT5JpvazltqXhqIEVITrO7mO8z2NW1vKRIHlmEaph3DUeugz4B3stjnNxYH8dNgV3G3nMyNsPWm7bAiRcBRVnEnPeN7aBt0hANYE+5ciwPGMYYQqsgjhnTL9Hd80ND11y/biRykfOedVHDbE5L4E6ENkVFtBnmbskhebuX/a6kKYn8+41v4j1HlOjO0aMowdNCz0xfyI0Fkawqlvde1PDd/Ik5PXKY9pVaivJfwIw+ClGxYiwOS6lc2wRAWFngFf9eMfrk6XyMvsCOUxlzs4kBabDZCBAE4I5UYTovuVKeY1X1ALaeT7f2Fs0M6oUBZ6X8omCBb1mI+S5iKS7huubGRJkqDDXOjkBkniYCYwXxxhCr0TI9hYz5r8u/H399fskb89Lt+ynPUTnwCegBBXGS2oh5S6jYts+m+PM5neE2kPNXYOCqXreSpCWLXkxo3zPtn/RGQ=" } } } \ No newline at end of file From a0374015783db96d8eec80462e83444ab83c5fdd Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 10:32:31 +0200 Subject: [PATCH 09/37] Verbose logging for sarama --- core/internal/helpers/sarama.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/internal/helpers/sarama.go b/core/internal/helpers/sarama.go index f8d6f64f..bda154d4 100644 --- a/core/internal/helpers/sarama.go +++ b/core/internal/helpers/sarama.go @@ -14,6 +14,8 @@ import ( "crypto/tls" "crypto/x509" "io/ioutil" + "log" + "os" "github.com/Shopify/sarama" "github.com/spf13/viper" @@ -78,6 +80,9 @@ func GetSaramaConfigFromClientProfile(profileName string) *sarama.Config { saramaConfig.Version = parseKafkaVersion(viper.GetString(configRoot + ".kafka-version")) saramaConfig.Consumer.Return.Errors = true + //verbose debugging (comment this line to disable verbose sarama logging) + sarama.Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags) + // Configure TLS if enabled if viper.IsSet(configRoot + ".tls") { tlsName := viper.GetString(configRoot + ".tls") From b67e1cffafda3b1f3a5db0987b2da4d124f3c52a Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 10:39:44 +0200 Subject: [PATCH 10/37] Enable hanshake --- secrets/production/burrow.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 1167c591..02e999f1 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "iXTe3b+2piDcFw1vVxoBdg==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGUEvuiUbBJzimKUWhk0DVtAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMFq/dT7LFrNmLbm4RAgEQgDsA2OIYSRmqsgnC6cGJECPJ8qgNsd5bqSAj6L567KIgUpEmL22+EfkmSrkhXSPoSxq/tI2K0qUDv6iYlw==", - "data": "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" + "iv": "iHjBg18H8vkDNOAgCd/KxA==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEdyw0ImAtESIkDlthgvuWWAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMd+Rduopu/3+23RQhAgEQgDu2bm5Jg/luG5kBLfA7j/s8dyQTf16ZIuaS/Mhhb0c1yNk+aMAz/SHreejNG7OMdg2Bor7s8QCtOX2uqw==", + "data": "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" } } } \ No newline at end of file From c39eae35f4844c96add0b3179a8390e2ed2f00c5 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 11:01:52 +0200 Subject: [PATCH 11/37] Update samara helper and log to info --- core/internal/helpers/sarama.go | 8 ++++++-- secrets/production/burrow.json | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/internal/helpers/sarama.go b/core/internal/helpers/sarama.go index bda154d4..a52c3079 100644 --- a/core/internal/helpers/sarama.go +++ b/core/internal/helpers/sarama.go @@ -80,8 +80,12 @@ func GetSaramaConfigFromClientProfile(profileName string) *sarama.Config { saramaConfig.Version = parseKafkaVersion(viper.GetString(configRoot + ".kafka-version")) saramaConfig.Consumer.Return.Errors = true - //verbose debugging (comment this line to disable verbose sarama logging) - sarama.Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags) + if (viper.IsSet("logging")) { + viper.SetDefault("logging.level", "info") + if (viper.GetString("logging.level") == "debug") { + sarama.Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags) + } + } // Configure TLS if enabled if viper.IsSet(configRoot + ".tls") { diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 02e999f1..ba11e96b 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "iHjBg18H8vkDNOAgCd/KxA==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEdyw0ImAtESIkDlthgvuWWAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMd+Rduopu/3+23RQhAgEQgDu2bm5Jg/luG5kBLfA7j/s8dyQTf16ZIuaS/Mhhb0c1yNk+aMAz/SHreejNG7OMdg2Bor7s8QCtOX2uqw==", - "data": "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" + "iv": "WzuBcnsX4IogaoIwUNL3bw==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwFTS8wcaghRRmp/Wf/2SvoBAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMv6jMHiEXUnJTFpJgAgEQgDsL4RMBEOSHN3GErpqXYz8zG/PzgLXmToNYWdbTeXf+fdaRAoxprAbmx5Ih1ZyhX5nh0XDmu8Is4tpzwg==", + "data": "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" } } } \ No newline at end of file From e6e4eb964c4bfc4d4aef654a9db5883764ec9aeb Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 12:35:53 +0200 Subject: [PATCH 12/37] Expose burrow HTTP backend --- Dockerfile | 4 +- configs/production/burrow/burrow.toml | 77 --------------------------- gygservice.yml | 5 +- 3 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 configs/production/burrow/burrow.toml diff --git a/Dockerfile b/Dockerfile index 6f2e7eb1..c32265ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,4 +18,6 @@ WORKDIR /app COPY --from=builder /tmp/burrow /app/ ADD /docker-config/burrow.toml /etc/burrow/ -CMD ["/app/burrow", "--config-dir", "/etc/burrow"] \ No newline at end of file +EXPOSE 8000 + +CMD ["/app/burrow", "--config-dir", "/etc/burrow"] diff --git a/configs/production/burrow/burrow.toml b/configs/production/burrow/burrow.toml deleted file mode 100644 index 70583306..00000000 --- a/configs/production/burrow/burrow.toml +++ /dev/null @@ -1,77 +0,0 @@ -# https://github.com/linkedin/Burrow/wiki/Configuration - -[general] -pidfile="burrow.pid" -# stdout-logfile="burrow.out" -access-control-allow-origin="burrow.frankfurt1.gygkube.com" - -[logging] -# filename="logs/burrow.log" -level="info" -# maxsize=100 -# maxbackups=30 -# maxage=10 -use-localtime=false -# use-compression=true - -[zookeeper] -servers=[ "zookeeper1.kafka1.gygkube.com:2181" ] -timeout=6 -root-path="/burrow" - -[client-profile.kafka1] -client-id="burrow-test" -kafka-version="1.1.0" -sasl="kafka1" - -[cluster.kafka1] -class-name="kafka" -servers=[ "kafka1.kafka1.frankfurt1.com:9092" ] -client-profile="kafka1" -topic-refresh=120 -offset-refresh=30 - -[consumer.kafka1] -class-name="kafka" -cluster="kafka1" -servers=[ "kafka1.kafka1.frankfurt1.com:9092" ] -client-profile="kafka1" -group-blacklist="^(console-consumer-|python-kafka-consumer-|quick-|devops).*$" -group-whitelist="" - -[consumer.kafka1_zk] -class-name="kafka_zk" -cluster="kafka1" -servers=[ "zookeeper1.kafka1.gygkube.com:2181" ] -zookeeper-path="/burrow" -zookeeper-timeout=30 -group-blacklist="^(console-consumer-|python-kafka-consumer-|quick-|devops).*$" -group-whitelist="" - -[httpserver.default] -address=":8000" - -[storage.default] -class-name="inmemory" -workers=20 -intervals=15 -expire-group=604800 -min-distance=1 - -[sasl.kafka1] -username="${SASL_PLAIN_USERNAME}" -password="${SASL_PLAIN_PASSWORD}" -handshake-first=false - -# [notifier.default] -# class-name="http" -# url-open="http://someservice.example.com:1467/v1/event" -# interval=60 -# timeout=5 -# keepalive=30 -# extras={ api_key="REDACTED", app="burrow", tier="STG", fabric="mydc" } -# template-open="conf/default-http-post.tmpl" -# template-close="conf/default-http-delete.tmpl" -# method-close="DELETE" -# send-close=true -# threshold=1 diff --git a/gygservice.yml b/gygservice.yml index 6de11676..59dcd417 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -7,7 +7,8 @@ service: dockerfile: Dockerfile needs: - kafka - # config_files: - # burrow: template:/etc/burrow/config/ secret_files: burrow: /etc/burrow/ + ports: + - name: http + container: 8000 From b40e9fe23134e77bdad69b2858eb8409566138e4 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 15:42:24 +0200 Subject: [PATCH 13/37] Add dd annotations --- gygservice.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gygservice.yml b/gygservice.yml index 59dcd417..37598b01 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -12,3 +12,7 @@ service: ports: - name: http container: 8000 + annotations: + service-discovery.datadoghq.com/check_names: '["burrow"]' + service-discovery.datadoghq.com/init_configs: '[{}]' + service-discovery.datadoghq.com/instances: '[{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}]' From cc70def6b44e341e96e9198e8003eacd200b45d5 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 16:51:17 +0200 Subject: [PATCH 14/37] Fix annotations --- gygservice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index 37598b01..094d8cbe 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -13,6 +13,6 @@ service: - name: http container: 8000 annotations: - service-discovery.datadoghq.com/check_names: '["burrow"]' - service-discovery.datadoghq.com/init_configs: '[{}]' - service-discovery.datadoghq.com/instances: '[{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}]' + service-discovery.datadoghq.com/web.check_names: '["burrow"]' + service-discovery.datadoghq.com/web.init_configs: '[{}]' + service-discovery.datadoghq.com/web.instances: '[{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}]' From ff034b468deca045c48a2f62675c6b775165ac9e Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 12 Jun 2018 17:17:47 +0200 Subject: [PATCH 15/37] Fix annotations --- gygservice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index 094d8cbe..d945f4d7 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -13,6 +13,6 @@ service: - name: http container: 8000 annotations: - service-discovery.datadoghq.com/web.check_names: '["burrow"]' - service-discovery.datadoghq.com/web.init_configs: '[{}]' - service-discovery.datadoghq.com/web.instances: '[{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}]' + service-discovery.datadoghq.com/web.check_names: ["burrow"] + service-discovery.datadoghq.com/web.init_configs: [{}] + service-discovery.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] From d0764416f507b5b8abd28de8f1068e8f274d8c43 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 24 Sep 2018 14:21:15 +0200 Subject: [PATCH 16/37] Make service compliant --- DESIGN.md | 13 +++++++++++++ gygservice.yml | 1 + 2 files changed, 14 insertions(+) create mode 100644 DESIGN.md diff --git a/DESIGN.md b/DESIGN.md new file mode 100644 index 00000000..5fd1a77e --- /dev/null +++ b/DESIGN.md @@ -0,0 +1,13 @@ +# Burrow + +This repo is a fork from the linkedin project. It analyses and exposes metrics +over http. Then a custom datadog check is consuming it an produces `burrow.*` +metrics. + +At this moment those metrics are not used in monitor/dashboard. But in the +future services/people should rely on it. At this time it could makes sense to +move the level from business hours to something more critical. A downtime could +page teams for nothing. + +As it's just a fork turned into a gygservice, if you want to know more about how +it works, please read the readme or developers documentation. diff --git a/gygservice.yml b/gygservice.yml index d945f4d7..fcc3e6c1 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -2,6 +2,7 @@ version: '1' service: name: burrow owner: devops + owner: office hours containers: web: dockerfile: Dockerfile From 07832b6d4db3eb202527ce3539ffbc0cb6a28fd3 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Mon, 24 Sep 2018 14:24:38 +0200 Subject: [PATCH 17/37] hotfix typo (Make service compliant) --- gygservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gygservice.yml b/gygservice.yml index fcc3e6c1..edca1e0c 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -2,7 +2,7 @@ version: '1' service: name: burrow owner: devops - owner: office hours + level: office hours containers: web: dockerfile: Dockerfile From f0938a7c85864a2f3435ad9d3835489265d60d09 Mon Sep 17 00:00:00 2001 From: Fernando Cainelli Date: Wed, 3 Oct 2018 17:01:49 +0200 Subject: [PATCH 18/37] [OPS-2576] set resource limits --- gygservice.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gygservice.yml b/gygservice.yml index edca1e0c..eec63fe1 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -5,6 +5,13 @@ service: level: office hours containers: web: + resources: + requests: + memory: 64Mi + cpu: 200m + limits: + memory: 64Mi + cpu: 200m dockerfile: Dockerfile needs: - kafka From 238ac39a8842944c98c598c8341151576f94c73b Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 24 Jan 2019 13:11:45 +0100 Subject: [PATCH 19/37] Update Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c32265ee..c3fb6fb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,4 @@ WORKDIR /app COPY --from=builder /tmp/burrow /app/ ADD /docker-config/burrow.toml /etc/burrow/ -EXPOSE 8000 - CMD ["/app/burrow", "--config-dir", "/etc/burrow"] From b0e6a47f29d7e45146891b7eab045a594ad16e74 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 24 Jan 2019 13:24:33 +0100 Subject: [PATCH 20/37] Update kafka-version to 2.1.0 --- config/burrow.toml | 2 +- secrets/production/burrow.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/burrow.toml b/config/burrow.toml index aae38dfa..02f7413b 100644 --- a/config/burrow.toml +++ b/config/burrow.toml @@ -19,7 +19,7 @@ root-path="/burrow" [client-profile.test] client-id="burrow-test" -kafka-version="0.10.0" +kafka-version="2.1.0" [cluster.local] class-name="kafka" diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index ba11e96b..b8133c07 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "WzuBcnsX4IogaoIwUNL3bw==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwFTS8wcaghRRmp/Wf/2SvoBAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMv6jMHiEXUnJTFpJgAgEQgDsL4RMBEOSHN3GErpqXYz8zG/PzgLXmToNYWdbTeXf+fdaRAoxprAbmx5Ih1ZyhX5nh0XDmu8Is4tpzwg==", - "data": "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" + "iv": "7iRPnt3m7pvXIQ3rgIjTsA==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHUcY5oEgKen1E8yoML3RdqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMrlQY/Cy8+VRd1rrzAgEQgDsSEpVc418Tw2qMsqGMC6NOBrR4oxWNBkhFYK+5Om9xxDsgR2Ua3qDoSoLo/KVX8hkhP5IR7Tu5eqgosA==", + "data": "atw+zw2qPlOxGuzPosdATxhyOlEjRk+/qsEv4MqIjZJHzL8HyhBe2CLGOTWxLD97Lnv7iIowfyyQQK3nzh3ubvZxjQiYQLi+KNThtJnqd/iZmvpWQa7kgc6fnOUEvYlyNuR2qEaK06lKCXdRIX+IcIi8o5O5kAkvkxyjfdnUteEnpbTi9gG0RV3N8NwBK/QIbbnzqx6uNMeiwTAdx/vxHnOki6eUldRsF3d4ddtK1pq9AZvERsB5RFJm89zp3ylqhIy7FSfgwIqvd2z37TvfFHRkMhmu84+vQwV2Bqop4xOpp7uICyXOcWizOe74/NdM2axGPkQR68ULVaPmCKPM/PXfuDQTfZL99Cz0t2/0f+h6ta+IPnHAnPZLQ9lTYwZvKqaWCq2eIIo0BxLOrTlwN+9uixh3qu4o9Q90uH+6Efoo+8yF6a3YoC4jcKpnp2OZfQav8pki7Pvkx2w80Vz8Umfad8fQ31K0Ltw03mw37bJWm8CDWSe/H4Xe08RLF8/PYlFvFSuplQGIr50h1uZiYkCVIe7oY99CaZi7G94ygynS3tdvaeCErgYlAoVMg+oafsh5tCc5+WSvaafyJNW2WcuPJXOIYROVf/2jAqtpJYRwoZuDu935bB9Q2ENDCSYpJl9QvT4XKokvKH7dwxO36eS/7DgMKTp89yJe2h0lKK1ZkNJJuaXedSB4FcYsxU1+eW+zJXLLuEHBEDDLGA6+MO8NOY1Lu4IM7VdF0HRQYH1bkruQC7xZ/XfErWPHp/NwyFa09jr/E7ktFN4HJoMoWPd0jIi7VEZljoXLPgmpX5Wv9bXoxY2QeFDjUfxGWmXbY2pBT6tIJFvvqrr1ZN72KVKgVjmfAMDKkuzbUEa2XG8gRYobkmHkHjmt3ErsgdzrHVHwbmds6Dx4h3LxSJL3VTjXu2G5YDVnKqO5QWCoWOlWvO2xxfb9jBMtKzuawj44BAtgAoIKTzpqEhpAbCBnoVN9S5KWZByA0FEUIYTIVMpZ+ztNoCRapes8ck6PHUjySNszL/xhtVPiaRy6HOIINq0rJma8g9InNVb1KdxXiWe9Gvf9KFLqasQRvRkHdCFmxQkjwBaoUC6hVmEgutkPNgd1i29ni1M5+t1WdOdNCO6/20dcORGxFcwL3PDidtQbZ28IcmiJQl7abSxQhxCWHT0AkAH+g8IHqQ2hc8M5YHr4MjFV99UGolZgeWA21BQLC1dfPVrIsILSbQGkH+sF25c7y5JSEwbOW/Aw/UaGMeyUUfzS8Jpf2kpcDDonxFRbBIafa+ZfDLuc+cKY0VnQAcPua4AnM75L56deVBcAppl1bYoYE2Qzegy4Z6gheL4f6BKDWivshtBRFbCMQS4Bfc06U4UG4C09mlMSweKtBwXGy/Yzafw8ThrwKCZeHWDErNxSSy6t6TLGiGh9jm7WzhVmbAmtpkx/g96nRfiBaCPCMWbm++Jf1P0U7aAoNnhwQfquG/GqYLNT2mtsZD0fSPh+LNt5eNHt+muE/QN3NJExJWaPOFcTMEYtQMionvFnd5PNePs1Jrcq78S1AJJKf9HDF2CJZ9BqoxOEkyKdxtdJ5ixQruobNJcerypIV37vK/OMfy02pyKtOCAKmzlqlUCu59sSIcmUZYVTraJXOtqTPOC9yORV2EEFowBuqroLBG0UKiRq6F+UmfCjwVLBGW93QvsqjBJ+0JzJh+rUDNyz6MXQqtSSEaSXvaT1dSCnNUpqu1bb0adidNIosAZkndGkrv/ONRpfZ8vJThWWvNKYxb7NGH/RonjKHPR1PR1UjwMjbsKC7CPR6zVaANMPsYk3tSJYAcnmk22SVSJ1zMDzulzUHAtgucVaqLfo8ZiPNQW09PADqXSlNMH9dl/V+VGpy1hbdJcwmu2Y0DKfLZk4VgQuroG1antsZ1Zng+QBJca8dzVi+4w22+LYXkMwIE8UhGK5XAwa1pkUSRibvPx3BYOGLj9DuceA7l06mt5BmrhhTGeLM74Y5bwEIMc19k3+FP8c5XnRIZnFK68T2z61Gn99MDJbAPtVTtWbTaj+FhxkxoY3VQ8AD3oMC6WShx1vokv9L3RPYYKM3eFboaV2BOpVMsuKUB8bdD5OkDE0Yge+M9Xi0TpNhPLNwfBi/8r+3g4rcvwEBvMAQSHcuPEKZu8Sn3E4x5+W8ByUrPMY2osh7Kg6aL/AtjBqmwoDwnA1e5sM7dJti0qJjwJt5kZ0uINWqel61U8oen8ocNftdfojCsgzvszq26/AoOcg/IaLPaWNU0b6E7+vly5dE9Y=" } } } \ No newline at end of file From 1e8e647e24aa7d0aeddfc6d7cda18d66ae66c417 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 24 Jan 2019 13:36:10 +0100 Subject: [PATCH 21/37] Update datadog annotations --- gygservice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index eec63fe1..299e985e 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -21,6 +21,6 @@ service: - name: http container: 8000 annotations: - service-discovery.datadoghq.com/web.check_names: ["burrow"] - service-discovery.datadoghq.com/web.init_configs: [{}] - service-discovery.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] + ad.datadoghq.com/web.check_names: ["burrow"] + ad.datadoghq.com/web.init_configs: [{}] + ad.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] From 0c35ba5308ad410a40df30d94ac637c1b29ad92c Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 24 Jan 2019 14:16:08 +0100 Subject: [PATCH 22/37] Expose burrow HTTP backend --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index c3fb6fb5..c32265ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,4 +18,6 @@ WORKDIR /app COPY --from=builder /tmp/burrow /app/ ADD /docker-config/burrow.toml /etc/burrow/ +EXPOSE 8000 + CMD ["/app/burrow", "--config-dir", "/etc/burrow"] From 6673895da1cfd269d87c95de7a7066255340a2d3 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 24 Jan 2019 15:04:04 +0100 Subject: [PATCH 23/37] Incread memory resources --- gygservice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index 299e985e..b944538e 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -7,10 +7,10 @@ service: web: resources: requests: - memory: 64Mi + memory: 256Mi cpu: 200m limits: - memory: 64Mi + memory: 256Mi cpu: 200m dockerfile: Dockerfile needs: From a2fb8ef8826d6de5e23cc7b7df68a4d85973a6d8 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 28 Mar 2019 17:07:55 +0100 Subject: [PATCH 24/37] [DI-189] Increase CPU and set minimum-complete to 0.20 (#2) --- gygservice.yml | 4 ++-- secrets/production/burrow.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index b944538e..65c2fa52 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -8,10 +8,10 @@ service: resources: requests: memory: 256Mi - cpu: 200m + cpu: 1000m limits: memory: 256Mi - cpu: 200m + cpu: 1000m dockerfile: Dockerfile needs: - kafka diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index b8133c07..12a5c347 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "7iRPnt3m7pvXIQ3rgIjTsA==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHUcY5oEgKen1E8yoML3RdqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMrlQY/Cy8+VRd1rrzAgEQgDsSEpVc418Tw2qMsqGMC6NOBrR4oxWNBkhFYK+5Om9xxDsgR2Ua3qDoSoLo/KVX8hkhP5IR7Tu5eqgosA==", - "data": "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" + "iv": "9y4j1OvZWm65tBeMCmd7eA==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHmomEEztCyoh19ZmywI5A8AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMREBUJqeFhGekLzvXAgEQgDsDkoZU7BMs2uQc4AA8aKl3Ou+tGnLbVpJiESFHSr6hfn6OBcIZjPl0qbYrAVSSPIxkBdlHp/XT117PUw==", + "data": "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" } } } \ No newline at end of file From 54ab69106d88739b80b339980d57f552c369dc60 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Fri, 29 Mar 2019 09:41:27 +0100 Subject: [PATCH 25/37] [DI-189] Set minimum-complete to 1 --- secrets/production/burrow.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 12a5c347..41ff53bd 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "9y4j1OvZWm65tBeMCmd7eA==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHmomEEztCyoh19ZmywI5A8AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMREBUJqeFhGekLzvXAgEQgDsDkoZU7BMs2uQc4AA8aKl3Ou+tGnLbVpJiESFHSr6hfn6OBcIZjPl0qbYrAVSSPIxkBdlHp/XT117PUw==", - "data": "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" + "iv": "kzwrxPTp6DQ4MOtY5X42Mg==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwE9tWERSZPdFRy2n5S+OtI9AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMaRlUN05Z6KqMm1RvAgEQgDuh6HyGj4HxNbj1Ow0rVncqYaHmUSZoovdpSzvvei0aw6xdeQoY2vpkl8yTvOTPPGtkyG3viWAqW09TFw==", + "data": "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" } } } \ No newline at end of file From 0b7686ae077ad2627d8a40f2a7a330b4113493ad Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Fri, 29 Mar 2019 10:15:06 +0100 Subject: [PATCH 26/37] [DI-189] More cpu and config udpate --- gygservice.yml | 4 ++-- secrets/production/burrow.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index 65c2fa52..25ca4cea 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -8,10 +8,10 @@ service: resources: requests: memory: 256Mi - cpu: 1000m + cpu: 1500m limits: memory: 256Mi - cpu: 1000m + cpu: 1500m dockerfile: Dockerfile needs: - kafka diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 41ff53bd..04f3ba35 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "kzwrxPTp6DQ4MOtY5X42Mg==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwE9tWERSZPdFRy2n5S+OtI9AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMaRlUN05Z6KqMm1RvAgEQgDuh6HyGj4HxNbj1Ow0rVncqYaHmUSZoovdpSzvvei0aw6xdeQoY2vpkl8yTvOTPPGtkyG3viWAqW09TFw==", - "data": "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" + "iv": "XXZ1whG7LfpZorAY18rpow==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGMKW7ay7slPMYgCiGEqyhRAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMRXmAMrJTVNwMItPwAgEQgDv0RbCqMkEBkQLdPc6VEBuJh/rSYm4wPAzuioHv2oCxaxBiTIQSkoHIx6br+XXoLfUZtd7cDz9mWpXTMw==", + "data": "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" } } } \ No newline at end of file From 2959b0e1529c68346402aaa1e61cc3c206ad5cca Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 4 Apr 2019 09:31:30 +0200 Subject: [PATCH 27/37] [SKIP CI] Add readme to rebase fork --- gyg-how-to-update.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 gyg-how-to-update.txt diff --git a/gyg-how-to-update.txt b/gyg-how-to-update.txt new file mode 100644 index 00000000..d1f79ae8 --- /dev/null +++ b/gyg-how-to-update.txt @@ -0,0 +1,3 @@ +git remote add upstream https://github.com/linkedin/Burrow.git +git fetch upstream +git rebase v1.2.2 # replace by the release, dont take master From b156df64afac69c8a4a94a982d9327f649981448 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 4 Apr 2019 11:01:26 +0200 Subject: [PATCH 28/37] trigger build From a767bf7c61a0daf5e3574e5edd7a46414a8522ac Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 4 Apr 2019 11:44:50 +0200 Subject: [PATCH 29/37] Add details config (#3) * [BUILD] Add details in evaluator config endpoint * [BUILD] Fix comma typo --- core/internal/httpserver/config.go | 1 + core/internal/httpserver/structs.go | 1 + 2 files changed, 2 insertions(+) diff --git a/core/internal/httpserver/config.go b/core/internal/httpserver/config.go index 8191af90..470f9f42 100644 --- a/core/internal/httpserver/config.go +++ b/core/internal/httpserver/config.go @@ -186,6 +186,7 @@ func (hc *Coordinator) configEvaluatorDetail(w http.ResponseWriter, r *http.Requ Module: httpResponseConfigModuleEvaluator{ ClassName: viper.GetString(configRoot + ".class-name"), ExpireCache: viper.GetInt64(configRoot + ".expire-cache"), + MinimumComplete: viper.GetInt64(configRoot + ".minimum-complete"), }, Request: requestInfo, }) diff --git a/core/internal/httpserver/structs.go b/core/internal/httpserver/structs.go index 5ba6a7be..02675ddf 100644 --- a/core/internal/httpserver/structs.go +++ b/core/internal/httpserver/structs.go @@ -184,6 +184,7 @@ type httpResponseConfigModuleConsumer struct { type httpResponseConfigModuleEvaluator struct { ClassName string `json:"class-name"` ExpireCache int64 `json:"expire-cache"` + MinimumComplete int64 `json:"minimum-complete"` } type httpResponseConfigModuleNotifierHTTP struct { From d4f34d8e720def03c18cb4e574f49b315771e1a3 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 4 Apr 2019 13:42:03 +0200 Subject: [PATCH 30/37] Add test-burrow sidecar --- gygservice.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gygservice.yml b/gygservice.yml index 25ca4cea..28d60213 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -24,3 +24,5 @@ service: ad.datadoghq.com/web.check_names: ["burrow"] ad.datadoghq.com/web.init_configs: [{}] ad.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] + test-burrow: + image: mthoretton1/test-burrow From 86f4049d1b4f2fede534d589cb2006fd39ff8961 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 4 Apr 2019 13:45:57 +0200 Subject: [PATCH 31/37] Fix container name --- gygservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gygservice.yml b/gygservice.yml index 28d60213..ab0d5200 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -24,5 +24,5 @@ service: ad.datadoghq.com/web.check_names: ["burrow"] ad.datadoghq.com/web.init_configs: [{}] ad.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] - test-burrow: + test_burrow: image: mthoretton1/test-burrow From 3572c8e30593ff91fb68f4bd81e051bddab46db0 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Thu, 4 Apr 2019 13:50:35 +0200 Subject: [PATCH 32/37] Fix container name --- gygservice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gygservice.yml b/gygservice.yml index ab0d5200..5966da0a 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -24,5 +24,5 @@ service: ad.datadoghq.com/web.check_names: ["burrow"] ad.datadoghq.com/web.init_configs: [{}] ad.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] - test_burrow: + testburrow: image: mthoretton1/test-burrow From e0f2b2b65c96687084d88d0846ba73c1ec4c7321 Mon Sep 17 00:00:00 2001 From: emmanuel Date: Thu, 4 Apr 2019 15:30:47 +0200 Subject: [PATCH 33/37] [DI-189] Make burrow start consuming __consumer_offsets from latest for faster bootstrap --- secrets/production/burrow.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 04f3ba35..0bad997c 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,9 @@ { "data": { "burrow.toml": { - "iv": "XXZ1whG7LfpZorAY18rpow==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGMKW7ay7slPMYgCiGEqyhRAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMRXmAMrJTVNwMItPwAgEQgDv0RbCqMkEBkQLdPc6VEBuJh/rSYm4wPAzuioHv2oCxaxBiTIQSkoHIx6br+XXoLfUZtd7cDz9mWpXTMw==", - "data": "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" + "iv": "vFpPpedr8Azv9apafe1Q/Q==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHr5NVBBshj6OQv3SAQMtfeAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMv7EL4OiNp+zbCKHrAgEQgDtvgFyO0MsDpKx4QK9u1eY8fYodp6Y+U05v6RMphOnAbYg5jr4wdRfnoqu0PhS3+mHtKVdC/EV+arhH/w==", + "data": "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" } } } \ No newline at end of file From 82ecac01d94dc817e2bf438ee24156f7eb787c6b Mon Sep 17 00:00:00 2001 From: emmanuel Date: Thu, 4 Apr 2019 15:31:39 +0200 Subject: [PATCH 34/37] [DI-189] Remove debugging sidecar --- gygservice.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gygservice.yml b/gygservice.yml index 5966da0a..25ca4cea 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -24,5 +24,3 @@ service: ad.datadoghq.com/web.check_names: ["burrow"] ad.datadoghq.com/web.init_configs: [{}] ad.datadoghq.com/web.instances: [{"burrow_uri": "http://%%host%%:8000", "clusters": ["kafka1"]}] - testburrow: - image: mthoretton1/test-burrow From 880570cd4417c7619cf6af6e25c0438e65a82c82 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Tue, 18 Jun 2019 12:58:26 +0200 Subject: [PATCH 35/37] [DI-269] Move kafka secret within service repo (#4) --- secrets/production/kafka.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 secrets/production/kafka.json diff --git a/secrets/production/kafka.json b/secrets/production/kafka.json new file mode 100644 index 00000000..d6d94426 --- /dev/null +++ b/secrets/production/kafka.json @@ -0,0 +1,24 @@ +{ + "data": { + "security_protocol": { + "iv": "4FmYDShj0NeLqfSMA0smnQ==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEjhHOcoGI81suLH4JpkiZgAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMLroGMUfZAK3fEa70AgEQgDstwnH4HYGZcgUWcQ+4c7rQwwhJPMR7OuNIwl+4wVmVGcgIdg/9c1VuIUL4sikOJKlIq2FIFnxZRFa/8A==", + "data": "vNDetLVB9hDqsRwcvJoLjQ==" + }, + "sasl_mechanism": { + "iv": "FMekpML16uN3TyyucJIEfQ==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGNr3/myZ3g1rBk/A9aRR2dAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMdCBvbCTzyy1mMWYBAgEQgDs+kOoXBgH0RlkLsgpR8Fi6wWDIBsHOgmb+zubM374LIx/ak22cS2dRdirA4PpLypkjvgtn2KAz7zjy0w==", + "data": "nKFI4Bl4EgboGaNh0aSFpg==" + }, + "sasl_plain_username": { + "iv": "ZRYUBL9dNKoJ/wCQS6eAZQ==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHceSpwZvSb/O/7DfMV+haqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMV4fhl5HxYMRPfkBAAgEQgDu1LFHgrKZrkzgYEUQnY1YhIxTHuJOb34QSuR64I26kOYMNhuzIROMul5LUF2RyzCsBkaNngWuUys7ZGA==", + "data": "HUm4ZXj9e+jURQ/PrGhOng==" + }, + "sasl_plain_password": { + "iv": "FeIRGWWBOwtYJKNsNOnwcw==", + "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHFsQ6hVCbM+pP5ufv633kzAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMjqckXniEcOjS28GUAgEQgDszfkpR/NKcfQ2Yv13yjIuUOFLQgwWoYiNbDIQm4YPlbIxckYduWvaIbnbQWw6mqtqRPVD2D4aaz3KaXw==", + "data": "Pz8lzMaNw0ArZJDpNQuKVw==" + } + } +} \ No newline at end of file From 6c76ce13672e6084997302b63d4339d41fabba13 Mon Sep 17 00:00:00 2001 From: Mathieu Thoretton Date: Wed, 24 Jul 2019 12:16:27 +0200 Subject: [PATCH 36/37] [DI-317] Change owner to di --- .drone.yml | 3 +-- gygservice.yml | 3 ++- secrets/production/burrow.json | 9 +++++---- secrets/production/kafka.json | 27 ++++++++++++++------------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5dfa628e..84227819 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ pipeline: privileged: true context: . dockerfile: ./Dockerfile - repo: hub.gyg.io/devops/burrow + repo: hub.gyg.io/service/burrow tags: - ${DRONE_BUILD_NUMBER}.${DRONE_COMMIT_SHA:0:7} when: @@ -13,7 +13,6 @@ pipeline: register-dss: image: hub.gyg.io/drone-plugins/dss privileged: true - repo: hub.gyg.io/devops/burrow tags: - ${DRONE_BUILD_NUMBER}.${DRONE_COMMIT_SHA:0:7} when: diff --git a/gygservice.yml b/gygservice.yml index 25ca4cea..38f0b345 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -1,7 +1,8 @@ version: '1' service: name: burrow - owner: devops + owner: di + image_name: service/burrow level: office hours containers: web: diff --git a/secrets/production/burrow.json b/secrets/production/burrow.json index 0bad997c..9d3dc0df 100644 --- a/secrets/production/burrow.json +++ b/secrets/production/burrow.json @@ -1,9 +1,10 @@ { "data": { "burrow.toml": { - "iv": "vFpPpedr8Azv9apafe1Q/Q==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHr5NVBBshj6OQv3SAQMtfeAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMv7EL4OiNp+zbCKHrAgEQgDtvgFyO0MsDpKx4QK9u1eY8fYodp6Y+U05v6RMphOnAbYg5jr4wdRfnoqu0PhS3+mHtKVdC/EV+arhH/w==", - "data": "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" + "iv": "zoLTLFEmReExIuxbSLW6RA==", + "edk": "AQIDAHiwVn67IJeh/zLC2ECLGkH+6xwCXfpNOUv/P9B/e8pXtAEoC+eSBIaBtxd8g1Dbri8AAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMHv95qqtigawXIGfCAgEQgDv++32NNEMD2I8ToDPouTw14NL0/y+PVIGjrPashxiijiA4y59kPqe4faR7k78ZkLneqS8Xy3YQIxgocg==", + "data": "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" } - } + }, + "key": "burrow" } \ No newline at end of file diff --git a/secrets/production/kafka.json b/secrets/production/kafka.json index d6d94426..1a7861fa 100644 --- a/secrets/production/kafka.json +++ b/secrets/production/kafka.json @@ -1,24 +1,25 @@ { "data": { "security_protocol": { - "iv": "4FmYDShj0NeLqfSMA0smnQ==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwEjhHOcoGI81suLH4JpkiZgAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMLroGMUfZAK3fEa70AgEQgDstwnH4HYGZcgUWcQ+4c7rQwwhJPMR7OuNIwl+4wVmVGcgIdg/9c1VuIUL4sikOJKlIq2FIFnxZRFa/8A==", - "data": "vNDetLVB9hDqsRwcvJoLjQ==" + "iv": "wKEDOI0MV82LtkmgIMPiuw==", + "edk": "AQIDAHiwVn67IJeh/zLC2ECLGkH+6xwCXfpNOUv/P9B/e8pXtAEULjtozvRKe90xxXb8yABfAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMtRLJ/AmBsmhbx0NhAgEQgDtvNHyBVnBEWMReMNR784R9MFCv8oDCOp7MLkZxFTXbDIDvyI6hqg9q7xALRlLumMd0rKwngtYbI64V8Q==", + "data": "/1K7hf2bbtyfsUyII/nT/Q==" }, "sasl_mechanism": { - "iv": "FMekpML16uN3TyyucJIEfQ==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwGNr3/myZ3g1rBk/A9aRR2dAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMdCBvbCTzyy1mMWYBAgEQgDs+kOoXBgH0RlkLsgpR8Fi6wWDIBsHOgmb+zubM374LIx/ak22cS2dRdirA4PpLypkjvgtn2KAz7zjy0w==", - "data": "nKFI4Bl4EgboGaNh0aSFpg==" + "iv": "PWam3Z9KEL5HN1zd0qDR2g==", + "edk": "AQIDAHiwVn67IJeh/zLC2ECLGkH+6xwCXfpNOUv/P9B/e8pXtAH+AUh06+FQhCdR184bra+KAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMffZ4d39tk+x8+Y+vAgEQgDuX1QyYyR9IeoNmADna5snv+Z5zqgdLZwDULqK5gpQjb9EjVjobyvZ89YuhyOIFGXKXX4CjbpybWnRgxA==", + "data": "6H5SQX242lAvOI8ldbyMvw==" }, "sasl_plain_username": { - "iv": "ZRYUBL9dNKoJ/wCQS6eAZQ==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHceSpwZvSb/O/7DfMV+haqAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMV4fhl5HxYMRPfkBAAgEQgDu1LFHgrKZrkzgYEUQnY1YhIxTHuJOb34QSuR64I26kOYMNhuzIROMul5LUF2RyzCsBkaNngWuUys7ZGA==", - "data": "HUm4ZXj9e+jURQ/PrGhOng==" + "iv": "Px+YLaw3mA/AmaTgS1f6/g==", + "edk": "AQIDAHiwVn67IJeh/zLC2ECLGkH+6xwCXfpNOUv/P9B/e8pXtAE9OIbxJfGy4NQkCuC3nwjEAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMaD2KAyFywMnDXN7oAgEQgDvAk3dIBtdE4hhLx+xtdnCtOlGW6PRtZWYT+cDWP1hWfaqUOPdTuF97QIyD+fxH9l+30ADj+kEGnisa2Q==", + "data": "8m8pdEy6w/Z+47WiSL23Hg==" }, "sasl_plain_password": { - "iv": "FeIRGWWBOwtYJKNsNOnwcw==", - "edk": "AQIDAHjuI4ZNYgp7uy6Lz8gYNLk7WIToIc+4JcO7BoRKbs01BwHFsQ6hVCbM+pP5ufv633kzAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMjqckXniEcOjS28GUAgEQgDszfkpR/NKcfQ2Yv13yjIuUOFLQgwWoYiNbDIQm4YPlbIxckYduWvaIbnbQWw6mqtqRPVD2D4aaz3KaXw==", - "data": "Pz8lzMaNw0ArZJDpNQuKVw==" + "iv": "6lQwpK1bZX1Rh1ec3URXmA==", + "edk": "AQIDAHiwVn67IJeh/zLC2ECLGkH+6xwCXfpNOUv/P9B/e8pXtAHwlZ/Ia2qv8S5EH+Q5g9lrAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM7j9C8bKS8kM9mcuLAgEQgDtKmwZ54fFY64tgIISAmmY10eXMoB39spcK7ICXHBTngCYQvF0UOQ29+s6OXPv2aR6Rs4HO63T+tHr/Qw==", + "data": "obW1c96OC2g9QPHrCjpN1g==" } - } + }, + "key": "burrow" } \ No newline at end of file From 22fd8d299f2ce910bb307ec8e353654e8848deed Mon Sep 17 00:00:00 2001 From: emmanuel Date: Wed, 14 Aug 2019 13:04:22 +0200 Subject: [PATCH 37/37] [DI-335] Make burrow more compliant --- DESIGN.md | 9 +++------ gygservice.yml | 9 +++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/DESIGN.md b/DESIGN.md index 5fd1a77e..aed77378 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -1,13 +1,10 @@ # Burrow +## Description + This repo is a fork from the linkedin project. It analyses and exposes metrics over http. Then a custom datadog check is consuming it an produces `burrow.*` metrics. -At this moment those metrics are not used in monitor/dashboard. But in the -future services/people should rely on it. At this time it could makes sense to -move the level from business hours to something more critical. A downtime could -page teams for nothing. - As it's just a fork turned into a gygservice, if you want to know more about how -it works, please read the readme or developers documentation. +it works, please read the readme or [developers documentation](https://github.com/linkedin/Burrow/wiki). diff --git a/gygservice.yml b/gygservice.yml index 38f0b345..faa00931 100644 --- a/gygservice.yml +++ b/gygservice.yml @@ -21,6 +21,15 @@ service: ports: - name: http container: 8000 + livenessProbe: + httpGet: + path: burrow/admin + port: 8000 + periodSeconds: 60 + initialDelaySeconds: 60 + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 15 annotations: ad.datadoghq.com/web.check_names: ["burrow"] ad.datadoghq.com/web.init_configs: [{}]