From b15373dd02dd41302a93b2946677f899749201f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Ko=C5=82odziejczyk?= Date: Sat, 28 Sep 2024 21:52:37 +0200 Subject: [PATCH] wip --- elk-ror/conf/es/log4j2.properties | 2 +- elk-ror/docker-compose.yml | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/elk-ror/conf/es/log4j2.properties b/elk-ror/conf/es/log4j2.properties index 8b212bb..00ba0a2 100644 --- a/elk-ror/conf/es/log4j2.properties +++ b/elk-ror/conf/es/log4j2.properties @@ -85,4 +85,4 @@ appender.header_warning.type = HeaderWarningAppender appender.header_warning.name = header_warning logger.ror.name=tech.beshu.ror.accesscontrol.blocks.rules.elasticsearch.indices -logger.ror.level=debug \ No newline at end of file +logger.ror.level=debug diff --git a/elk-ror/docker-compose.yml b/elk-ror/docker-compose.yml index 82a30ef..084464a 100644 --- a/elk-ror/docker-compose.yml +++ b/elk-ror/docker-compose.yml @@ -22,6 +22,9 @@ services: - bootstrap.memory_lock=true # for a sake of debugging and profiling - "ES_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.rmi.port=9010 -Djava.rmi.server.hostname=127.0.0.1" + - KIBANA_SERVICE_ACCOUNT_TOKEN=UNUSED + - INTERNAL_PROBE_PASS=UNUSED + - INTERNAL_USR_PASS=UNUSED healthcheck: test: [ "CMD", "curl", "-fk", "-u", "kibana:kibana", "https://localhost:9200/_cluster/health" ] interval: 10s @@ -37,6 +40,16 @@ services: volumes: - /tmp/visualvm:/tmp/visualvm + es-kbn-logging-proxy: + image: mitmproxy/mitmproxy + command: + mitmdump --set validate_inbound_headers=false --mode reverse:https://es-ror:9200 --ssl-insecure --verbose + depends_on: + es-ror: + condition: service_healthy + networks: + - es-ror-network + kbn-ror: build: context: ../. @@ -57,8 +70,8 @@ services: ports: - "15601:5601" environment: - ELASTIC_USER_PASSWORD: elastic - ES_API_URL: https://es-ror:9200 + ES_API_URL: https://es-kbn-logging-proxy:8080 + # ES_API_URL: https://es-ror:9200 healthcheck: test: [ "CMD", "curl", "-k", "--fail", "https://localhost:5601/api/status" ] interval: 10s