Enable bg_mon by default (#169)

previously it was installed by not enabled.
zalando · May 30, 2017 · be3aa6d · be3aa6d
1 parent d66eed8
commit be3aa6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile
@@ -48,7 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get install -y libprotobuf-c1 libevent-2.0 $BUILD_PACKAGES \
 
     # prepare bg_mon sources
-    && export BG_MON_COMMIT=ca99fac2fa9aed6284da481ccdb5395ccfa1fd6a \
+    && export BG_MON_COMMIT=9fc9427adef48d44adcd4070b05eea8e32f2a0e7 \
     && curl -s -L https://github.com/CyberDem0n/bg_mon/archive/$BG_MON_COMMIT.tar.gz | tar xz \
 
     && export DECODEBUFS_COMMIT=d9415fc78fa255d990ea2371720876bebe34ceb9 \
@@ -169,6 +169,6 @@ RUN chmod 700 /postgres_*
 ENV ETCD_DISCOVERY_DOMAIN=postgres.acid.example.com LC_ALL=en_US.utf-8
 
 WORKDIR $PGHOME
-EXPOSE 5432 8008
+EXPOSE 5432 8008 8080
 RUN chown -R postgres:postgres /postgres_* $PGHOME
 CMD ["/bin/bash", "/launch.sh"]
diff --git a/postgres-appliance/configure_spilo.py b/postgres-appliance/configure_spilo.py
@@ -135,7 +135,6 @@ def deep_update(a, b):
         log_disconnections: 'on'
         log_statement: 'ddl'
         log_temp_files: 0
-        shared_preload_libraries: pg_stat_statements
         track_functions: all
         checkpoint_completion_target: 0.9
         autovacuum_max_workers: 5
@@ -170,6 +169,8 @@ def deep_update(a, b):
     ssl: 'on'
     ssl_cert_file: {{SSL_CERTIFICATE_FILE}}
     ssl_key_file: {{SSL_PRIVATE_KEY_FILE}}
+    shared_preload_libraries: 'bg_mon,pg_stat_statements'
+    bg_mon.listen_address: '0.0.0.0'
   {{#USE_WALE}}
   recovery_conf:
     restore_command: envdir "{{WALE_ENV_DIR}}" /wale_restore_command.sh "%f" "%p"