Merge "Remove all traces of process monitor"
This commit is contained in:
commit
c4e4faffc3
|
@ -22,17 +22,14 @@ class MasakariMonitorsCharm(charms_openstack.charm.OpenStackCharm):
|
||||||
release = 'rocky'
|
release = 'rocky'
|
||||||
|
|
||||||
# List of packages to install for this charm
|
# List of packages to install for this charm
|
||||||
packages = ['masakari-host-monitor', 'masakari-instance-monitor',
|
packages = ['masakari-host-monitor', 'masakari-instance-monitor']
|
||||||
'masakari-process-monitor']
|
|
||||||
|
|
||||||
services = ['masakari-host-monitor', 'masakari-instance-monitor',
|
services = ['masakari-host-monitor', 'masakari-instance-monitor']
|
||||||
'masakari-process-monitor']
|
|
||||||
|
|
||||||
required_relations = ['identity-credentials']
|
required_relations = ['identity-credentials']
|
||||||
|
|
||||||
restart_map = {
|
restart_map = {
|
||||||
'/etc/masakarimonitors/masakarimonitors.conf': services,
|
'/etc/masakarimonitors/masakarimonitors.conf': services,
|
||||||
'/etc/masakarimonitors/process_list.yaml': services,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
release_pkg = 'masakari-monitors-common'
|
release_pkg = 'masakari-monitors-common'
|
||||||
|
|
|
@ -32,4 +32,3 @@ disable_ipmi_check = True
|
||||||
[libvirt]
|
[libvirt]
|
||||||
[oslo_middleware]
|
[oslo_middleware]
|
||||||
[process]
|
[process]
|
||||||
process_list_path = /etc/masakari/process_list.yaml
|
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
# WARNING: Maintained by Juju.
|
|
||||||
# Any manual changes will be overridden.
|
|
||||||
|
|
||||||
# Define the monitoring processes as follows:
|
|
||||||
# process_name: [Name of the process as it in 'ps -ef'.]
|
|
||||||
# start_command: [Start command of the process.]
|
|
||||||
# pre_start_command: [Command which is executed before start_command.]
|
|
||||||
# post_start_command: [Command which is executed after start_command.]
|
|
||||||
# restart_command: [Restart command of the process.]
|
|
||||||
# pre_restart_command: [Command which is executed before restart_command.]
|
|
||||||
# post_restart_command: [Command which is executed after restart_command.]
|
|
||||||
# run_as_root: [Bool value whether to execute commands as root authority.]
|
|
||||||
#
|
|
||||||
# These definitions need to be set according to the environment to use.
|
|
||||||
# Sample of definitions is shown below.
|
|
||||||
-
|
|
||||||
# libvirt-bin
|
|
||||||
process_name: /usr/sbin/libvirtd
|
|
||||||
start_command: systemctl start libvirtd
|
|
||||||
pre_start_command:
|
|
||||||
post_start_command:
|
|
||||||
restart_command: systemctl restart libvirtd
|
|
||||||
pre_restart_command:
|
|
||||||
post_restart_command:
|
|
||||||
run_as_root: True
|
|
||||||
-
|
|
||||||
# nova-compute
|
|
||||||
process_name: /usr/bin/nova-compute
|
|
||||||
start_command: systemctl start nova-compute
|
|
||||||
pre_start_command:
|
|
||||||
post_start_command:
|
|
||||||
restart_command: systemctl restart nova-compute
|
|
||||||
pre_restart_command:
|
|
||||||
post_restart_command:
|
|
||||||
run_as_root: True
|
|
||||||
-
|
|
||||||
# instancemonitor
|
|
||||||
process_name: /usr/bin/masakari-instancemonitor
|
|
||||||
start_command: systemctl start masakari-instance-monitor
|
|
||||||
pre_start_command:
|
|
||||||
post_start_command:
|
|
||||||
restart_command: systemctl restart masakari-instance-monitor
|
|
||||||
pre_restart_command:
|
|
||||||
post_restart_command:
|
|
||||||
run_as_root: True
|
|
||||||
-
|
|
||||||
# hostmonitor
|
|
||||||
process_name: /usr/bin/masakari-hostmonitor
|
|
||||||
start_command: systemctl start masakari-host-monitor
|
|
||||||
pre_start_command:
|
|
||||||
post_start_command:
|
|
||||||
restart_command: systemctl restart masakari-host-monitor
|
|
||||||
pre_restart_command:
|
|
||||||
post_restart_command:
|
|
||||||
run_as_root: True
|
|
||||||
-
|
|
||||||
# sshd
|
|
||||||
process_name: /usr/sbin/sshd
|
|
||||||
start_command: systemctl start ssh
|
|
||||||
pre_start_command:
|
|
||||||
post_start_command:
|
|
||||||
restart_command: systemctl restart ssh
|
|
||||||
pre_restart_command:
|
|
||||||
post_restart_command:
|
|
||||||
run_as_root: True
|
|
Loading…
Reference in New Issue