Adjusting CFME Processes/Workers that changed for 5.6

+ Separate Postgres Processes Change-Id: I2a86106079af287fb584d5312b9eb70d20b988bf
2016-04-19 15:37:23 -04:00
parent d663afa1fa
commit dfc8358803
5 changed files with 182 additions and 2 deletions
--- a/ansible/install/roles/collectd-generic/templates/cfme-all-in-one.collectd.conf.j2
+++ b/ansible/install/roles/collectd-generic/templates/cfme-all-in-one.collectd.conf.j2
@@ -184,6 +184,7 @@ LoadPlugin uptime
 <Plugin processes>
  # Appliance processes
  ProcessMatch "evm_server.rb" ".*evm_server\.rb$"
+  ProcessMatch "MIQServer" ".*MIQ.*Server$"
  ProcessMatch "evm_watchdog.rb" "/bin/evm_watchdog.rb"
  ProcessMatch "evm:dbsync:replicate" ".*evm:dbsync:replicate$"
  ProcessMatch "appliance_console.rb" ".*appliance_console.rb$"
@@ -196,6 +197,9 @@ LoadPlugin uptime
  ProcessMatch "MiqScheduleWorker" "MiqScheduleWorker.*"
  ProcessMatch "MiqUiWorker" "MiqUiWorker.*"
  ProcessMatch "MiqWebServiceWorker" "MiqWebServiceWorker.*"
+  ProcessMatch "PumaMiqUiWorker" "puma.*3.3.0.*3000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebServiceWorker" "puma.*3.3.0.*4000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebSocketsWorker" "puma.*3.3.0.*5000.*\[MIQ.*Web.*Server.*Worker\]"
  ProcessMatch "MiqReplicationWorker" "MiqReplicationWorker.*"
  ProcessMatch "MiqEmsMetricsProcessorWorker" "MiqEmsMetricsProcessorWorker.*"
  ProcessMatch "MiqSmartProxyWorker" "MiqSmartProxyWorker.*"
@@ -276,6 +280,18 @@ LoadPlugin uptime

  ProcessMatch "MiqStorageMetricsCollectorWorker" "MiqStorageMetricsCollectorWorker.*"

+
+  # Capture specific postgres processes:
+  ProcessMatch "PostgresMaster" "/opt/rh/rh-postgresql94/root/usr/bin/postgres"
+  ProcessMatch "PostgresLogger" "postgres: logger process"
+  ProcessMatch "PostgresCheckpoint" "postgres: checkpointer process"
+  ProcessMatch "PostgresWriter" "postgres: writer process"
+  ProcessMatch "PostgresWALWriter" "postgres: wal writer process"
+  ProcessMatch "PostgresAutovacuum" "postgres: autovacuum launcher process"
+  ProcessMatch "PostgresStats" "postgres: stats collector process"
+  ProcessMatch "PostgresPgLogical" "postgres: bgworker: pglogical supervisor"
+  ProcessMatch "PostgresServers" "postgres: root vmdb_production.*"
+
  ProcessMatch "carbon-cache" "python.+carbon-cache"
  Process "grafana-server"
  ProcessMatch "collectd" "/usr/sbin/collectd.+-C.+/etc/collectd.conf"
--- a/ansible/install/roles/collectd-generic/templates/cfme-vmdb.collectd.conf.j2
+++ b/ansible/install/roles/collectd-generic/templates/cfme-vmdb.collectd.conf.j2
@@ -184,6 +184,7 @@ LoadPlugin uptime
 <Plugin processes>
  # Appliance processes
  ProcessMatch "evm_server.rb" ".*evm_server\.rb$"
+  ProcessMatch "MIQServer" ".*MIQ.*Server$"
  ProcessMatch "evm_watchdog.rb" "/bin/evm_watchdog.rb"
  ProcessMatch "evm:dbsync:replicate" ".*evm:dbsync:replicate$"
  ProcessMatch "appliance_console.rb" ".*appliance_console.rb$"
@@ -196,6 +197,9 @@ LoadPlugin uptime
  ProcessMatch "MiqScheduleWorker" "MiqScheduleWorker.*"
  ProcessMatch "MiqUiWorker" "MiqUiWorker.*"
  ProcessMatch "MiqWebServiceWorker" "MiqWebServiceWorker.*"
+  ProcessMatch "PumaMiqUiWorker" "puma.*3.3.0.*3000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebServiceWorker" "puma.*3.3.0.*4000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebSocketsWorker" "puma.*3.3.0.*5000.*\[MIQ.*Web.*Server.*Worker\]"
  ProcessMatch "MiqReplicationWorker" "MiqReplicationWorker.*"
  ProcessMatch "MiqEmsMetricsProcessorWorker" "MiqEmsMetricsProcessorWorker.*"
  ProcessMatch "MiqSmartProxyWorker" "MiqSmartProxyWorker.*"
@@ -277,6 +281,17 @@ LoadPlugin uptime
  ProcessMatch "MiqStorageMetricsCollectorWorker" "MiqStorageMetricsCollectorWorker.*"


+  # Capture specific postgres processes:
+  ProcessMatch "PostgresMaster" "/opt/rh/rh-postgresql94/root/usr/bin/postgres"
+  ProcessMatch "PostgresLogger" "postgres: logger process"
+  ProcessMatch "PostgresCheckpoint" "postgres: checkpointer process"
+  ProcessMatch "PostgresWriter" "postgres: writer process"
+  ProcessMatch "PostgresWALWriter" "postgres: wal writer process"
+  ProcessMatch "PostgresAutovacuum" "postgres: autovacuum launcher process"
+  ProcessMatch "PostgresStats" "postgres: stats collector process"
+  ProcessMatch "PostgresPgLogical" "postgres: bgworker: pglogical supervisor"
+  ProcessMatch "PostgresServers" "postgres: root vmdb_production.*"
+
  ProcessMatch "collectd" "/usr/sbin/collectd.+-C.+/etc/collectd.conf"
  Process "httpd"
  Process "memcached"
--- a/ansible/install/roles/collectd-generic/templates/cfme.collectd.conf.j2
+++ b/ansible/install/roles/collectd-generic/templates/cfme.collectd.conf.j2
@@ -66,6 +66,7 @@ LoadPlugin uptime
 <Plugin processes>
  # Appliance processes
  ProcessMatch "evm_server.rb" ".*evm_server\.rb$"
+  ProcessMatch "MIQServer" ".*MIQ.*Server$"
  ProcessMatch "evm_watchdog.rb" "/bin/evm_watchdog.rb"
  ProcessMatch "evm:dbsync:replicate" ".*evm:dbsync:replicate$"
  ProcessMatch "appliance_console.rb" ".*appliance_console.rb$"
@@ -78,6 +79,9 @@ LoadPlugin uptime
  ProcessMatch "MiqScheduleWorker" "MiqScheduleWorker.*"
  ProcessMatch "MiqUiWorker" "MiqUiWorker.*"
  ProcessMatch "MiqWebServiceWorker" "MiqWebServiceWorker.*"
+  ProcessMatch "PumaMiqUiWorker" "puma.*3.3.0.*3000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebServiceWorker" "puma.*3.3.0.*4000.*\[MIQ.*Web.*Server.*Worker\]"
+  ProcessMatch "PumaMiqWebSocketsWorker" "puma.*3.3.0.*5000.*\[MIQ.*Web.*Server.*Worker\]"
  ProcessMatch "MiqReplicationWorker" "MiqReplicationWorker.*"
  ProcessMatch "MiqEmsMetricsProcessorWorker" "MiqEmsMetricsProcessorWorker.*"
  ProcessMatch "MiqSmartProxyWorker" "MiqSmartProxyWorker.*"
@@ -159,6 +163,17 @@ LoadPlugin uptime
  ProcessMatch "MiqStorageMetricsCollectorWorker" "MiqStorageMetricsCollectorWorker.*"


+  # Capture specific postgres processes:
+  ProcessMatch "PostgresMaster" "/opt/rh/rh-postgresql94/root/usr/bin/postgres"
+  ProcessMatch "PostgresLogger" "postgres: logger process"
+  ProcessMatch "PostgresCheckpoint" "postgres: checkpointer process"
+  ProcessMatch "PostgresWriter" "postgres: writer process"
+  ProcessMatch "PostgresWALWriter" "postgres: wal writer process"
+  ProcessMatch "PostgresAutovacuum" "postgres: autovacuum launcher process"
+  ProcessMatch "PostgresStats" "postgres: stats collector process"
+  ProcessMatch "PostgresPgLogical" "postgres: bgworker: pglogical supervisor"
+  ProcessMatch "PostgresServers" "postgres: root vmdb_production.*"
+
  ProcessMatch "collectd" "/usr/sbin/collectd.+-C.+/etc/collectd.conf"
  Process "httpd"
  Process "memcached"
--- a/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2
+++ b/ansible/install/roles/dashboard-generic/templates/cfme_general_system_performance.json.j2
@@ -3329,8 +3329,8 @@
        {
          "allFormat": "glob",
          "current": {
-            "text": "None",
-            "value": "None"
+            "text": "manageiq",
+            "value": "manageiq"
          },
          "datasource": null,
          "includeAll": false,
--- a/ansible/install/roles/dashboard-generic/vars/main.yml
+++ b/ansible/install/roles/dashboard-generic/vars/main.yml
@@ -83,9 +83,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -98,9 +110,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -289,6 +304,17 @@ per_process_panels:
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -301,9 +327,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -483,9 +512,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -498,9 +539,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -543,9 +587,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -558,9 +614,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -597,9 +656,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -612,9 +683,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -696,9 +770,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -711,9 +797,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -748,9 +837,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -763,9 +864,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -817,9 +921,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -832,9 +948,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker
@@ -877,9 +996,21 @@ per_process_panels:
        - collectd
    - name: "Appliance"
      processes:
+        - MIQServer
        - evm_server.rb
        - evm_watchdog.rb
        - appliance_console.rb
+    - name: "Postgres"
+      processes:
+        - PostgresMaster
+        - PostgresLogger
+        - PostgresCheckpoint
+        - PostgresWriter
+        - PostgresWALWriter
+        - PostgresAutovacuum
+        - PostgresStats
+        - PostgresPgLogical
+        - PostgresServers
    - name: "MiqGenericWorker"
      processes:
        - MiqGenericWorker
@@ -892,9 +1023,12 @@ per_process_panels:
    - name: "MiqUiWorker"
      processes:
        - MiqUiWorker
+        - PumaMiqUiWorker
    - name: "MiqWebServiceWorker"
      processes:
        - MiqWebServiceWorker
+        - PumaMiqWebServiceWorker
+        - PumaMiqWebSocketsWorker
    - name: "MiqReportingWorker"
      processes:
        - MiqReportingWorker