Update pgMonitor path in pgo-deployer

This allows for the successful installation of the Postgres Operator Monitoring stack in a variety of environments due to the various permission considerations.

Author: jmckulk

build/pgo-deployer/Dockerfile

@@ -70,7 +70,7 @@ fi
 
 COPY installers/ansible /ansible/postgres-operator
 COPY installers/metrics/ansible /ansible/metrics
-ADD tools/pgmonitor /tmp/.pgo/metrics/pgmonitor
+ADD tools/pgmonitor /opt/crunchy/pgmonitor
 COPY installers/image/bin/pgo-deploy.sh /pgo-deploy.sh
 COPY bin/uid_daemon.sh /uid_daemon.sh
 
@@ -79,7 +79,6 @@ ENV HOME="/tmp"
 
 RUN chmod g=u /etc/passwd
 RUN chmod g=u /uid_daemon.sh
-RUN chown -R 2:2 /tmp/.pgo
 
 ENTRYPOINT ["/uid_daemon.sh"]
 

installers/metrics/ansible/roles/pgo-metrics/tasks/alertmanager.yml

@@ -16,7 +16,7 @@
 
  - name: Set pgmonitor Prometheus Directory Fact
  set_fact:
- pgmonitor_prometheus_dir: "{{ metrics_dir }}/pgmonitor/prometheus"
+ pgmonitor_prometheus_dir: "{{ pgmonitor_dir }}/prometheus"
 
  - name: Copy Alertmanger Config to Output Directory
  command: "cp {{ pgmonitor_prometheus_dir }}/{{ item.src }} {{ alertmanager_output_dir }}/{{ item.dst }}"

installers/metrics/ansible/roles/pgo-metrics/tasks/grafana.yml

@@ -48,7 +48,7 @@
 
  - name: Set pgmonitor Grafana Directory Fact
  set_fact:
- pgmonitor_grafana_dir: "{{ metrics_dir }}/pgmonitor/grafana"
+ pgmonitor_grafana_dir: "{{ pgmonitor_dir }}/grafana"
 
  - name: Copy Grafana Config to Output Directory
  command: "cp {{ pgmonitor_grafana_dir }}/{{ item }} {{ grafana_output_dir }}"

installers/metrics/ansible/roles/pgo-metrics/tasks/main.yml

@@ -56,21 +56,44 @@
  block:
  - name: Check for pgmonitor
  stat:
- path: "{{ metrics_dir }}/pgmonitor"
- register: pgmonitor_dir
+ path: "/opt/crunchy/pgmonitor"
+ register: pgmonitor_dir_embed
+
+ - name: Set pgMonitor Directory Fact
+ block:
+ - name: Embeded Path
+ set_fact:
+ pgmonitor_dir: "/opt/crunchy/pgmonitor"
+ when: pgmonitor_dir_embed.stat.exists
+
+ - name: Downloaded Path
+ set_fact:
+ pgmonitor_dir: "{{ metrics_dir }}/pgmonitor"
+ when: not pgmonitor_dir_embed.stat.exists
+
+ - name: Ensure pgMonitor Output Directory Exists
+ file:
+ path: "{{ pgmonitor_dir }}"
+ state: directory
+ mode: 0700
+ when: not pgmonitor_dir_embed.stat.exists
 
  - name: Download pgmonitor {{ pgmonitor_version }}
  get_url:
  url: https://github.com/CrunchyData/pgmonitor/archive/{{ pgmonitor_version }}.tar.gz
  dest: "{{ metrics_dir }}"
  mode: "0600"
- when: not pgmonitor_dir.stat.exists
+ when: not pgmonitor_dir_embed.stat.exists
 
  - name: Extract pgmonitor
  unarchive:
  src: "{{ metrics_dir }}/pgmonitor-{{ pgmonitor_version | replace('v','') }}.tar.gz"
- dest: "{{ metrics_dir }}/pgmonitor"
- when: not pgmonitor_dir.stat.exists
+ dest: "{{ metrics_dir }}"
+ when: not pgmonitor_dir_embed.stat.exists
+
+ - name: Copy pgmonitor to correct directory
+ command: "cp -R {{ metrics_dir }}/pgmonitor-{{ pgmonitor_version | replace('v','') }}/. {{ pgmonitor_dir }}"
+ when: not pgmonitor_dir_embed.stat.exists
 
  - name: Create Metrics Image Pull Secret
  shell: >

installers/metrics/ansible/roles/pgo-metrics/tasks/prometheus.yml

@@ -35,7 +35,7 @@
 
  - name: Set pgmonitor Prometheus Directory Fact
  set_fact:
- pgmonitor_prometheus_dir: "{{ metrics_dir }}/pgmonitor/prometheus"
+ pgmonitor_prometheus_dir: "{{ pgmonitor_dir }}/prometheus"
 
  - name: Copy Prometheus Config to Output Directory
  command: "cp {{ pgmonitor_prometheus_dir }}/{{ item.src }} {{ prom_output_dir }}/{{ item.dst }}"