From cdc60aac81ab0d98efd2cbdc37fae88b231a52f5 Mon Sep 17 00:00:00 2001 From: Alex Kozyrev Date: Thu, 29 Nov 2018 10:48:42 -0500 Subject: [PATCH] Barbican integration into logging/patching mechanisms. - add barbican logs in syslog - support no reboot patching for barbican processes - get information about barbican in collect script Change-Id: I75557a2d35d3861c2dee3d0a5a0960bebc6d0e48 Story: 2003108 Task: 27700 Depends-On: I6b0b0c90456627bebde2b834b339bc968100b6f9 Signed-off-by: Alex Kozyrev --- .../syslog-ng-config/files/syslog-ng.conf | 20 +++++++++++++++++++ .../files/syslog-ng.logrotate | 1 + tools/collector/centos/build_srpm.data | 2 +- .../collector/scripts/collect_mask_passwords | 1 + .../centos/build_srpm.data | 2 +- .../scripts/cfg/engtools.conf | 6 +++--- tools/engtools/parsers/common/parse-all.sh | 2 +- .../engtools/parsers/common/parse-postgres.sh | 2 +- tools/engtools/parsers/host.conf | 3 ++- tools/engtools/parsers/lab.conf | 2 +- .../platform-util/centos/build_srpm.data | 2 +- .../scripts/patch-restart-processes | 10 ++++++++++ 12 files changed, 43 insertions(+), 10 deletions(-) diff --git a/config-files/syslog-ng-config/files/syslog-ng.conf b/config-files/syslog-ng-config/files/syslog-ng.conf index 0b5d1e3b4..32c7a3f6c 100644 --- a/config-files/syslog-ng-config/files/syslog-ng.conf +++ b/config-files/syslog-ng-config/files/syslog-ng.conf @@ -196,6 +196,11 @@ destination d_pankodbsync { file("/var/log/panko/panko-dbsync.log" temp destination d_pankoexpirer { file("/var/log/panko/panko-expirer.log" template(t_openstack)); }; destination d_gnocchiapi { file("/var/log/gnocchi/api.log" template(t_openstack)); }; destination d_gnocchimetricd { file("/var/log/gnocchi/metricd.log" template(t_openstack)); }; +destination d_barbicanapi { file("/var/log/barbican/barbican-api.log" template(t_openstack)); }; +destination d_barbicandbsync { file("/var/log/barbican/barbican-dbsync.log" template(t_openstack)); }; +destination d_barbicankeystonelistener { file("/var/log/barbican/barbican-keystone-listener.log" template(t_openstack)); }; +destination d_barbicanworker { file("/var/log/barbican/barbican-worker.log" template(t_openstack)); }; +destination d_barbicancleaner { file("/var/log/barbican/barbican-cleaner.log" template(t_openstack)); }; # NFV-VIM Log destinations destination d_vim { file("/var/log/nfv-vim.log" template(t_nfv)); }; @@ -329,6 +334,11 @@ filter f_local2 { facility(local2) and not program(cinder-scheduler) and not program(cinder-volume) and not program(cinder-backup) + and not program(barbican-api) + and not program(barbican-dbsync) + and not program(barbican-keystone-listener) + and not program(barbican-worker) + and not program(barbican-cleaner) and not filter(f_keystoneall) and not filter(f_keystoneapi) and not filter(f_neutronapi); }; @@ -423,6 +433,11 @@ filter f_ironicapi { facility(local2) and program(ironic-api); }; filter f_ironicconductor { facility(local2) and program(ironic-conductor); }; filter f_gnocchiapi { facility(local2) and program(gnocchi-api); }; filter f_gnocchimetricd { facility(local2) and program(gnocchi-metricd); }; +filter f_barbicanapi { facility(local2) and program(barbican-api); }; +filter f_barbicandbsync { facility(local2) and program(barbican-dbsync); }; +filter f_barbicankeystonelistener { facility(local2) and program(barbican-keystone-listener); }; +filter f_barbicanworker { facility(local2) and program(barbican-worker); }; +filter f_barbicancleaner { facility(local2) and program(barbican-cleaner); }; # NFV-VIM Log Filters filter f_vim { facility(user) and program(VIM_); }; @@ -542,6 +557,11 @@ log { source(s_src); filter(f_ironicapi); destination(d_ironicapi); }; log { source(s_src); filter(f_ironicconductor); destination(d_ironicconductor); }; log { source(s_src); filter(f_gnocchiapi); destination(d_gnocchiapi); }; log { source(s_src); filter(f_gnocchimetricd); destination(d_gnocchimetricd); }; +log { source(s_src); filter(f_barbicanapi); destination(d_barbicanapi); }; +log { source(s_src); filter(f_barbicandbsync); destination(d_barbicandbsync); }; +log { source(s_src); filter(f_barbicankeystonelistener); destination(d_barbicankeystonelistener); }; +log { source(s_src); filter(f_barbicanworker); destination(d_barbicanworker); }; +log { source(s_src); filter(f_barbicancleaner); destination(d_barbicancleaner); }; # NFV-VIM Log Paths log {source(s_src); filter(f_vim); destination(d_vim); }; diff --git a/config-files/syslog-ng-config/files/syslog-ng.logrotate b/config-files/syslog-ng-config/files/syslog-ng.logrotate index f26ebc03a..db61e0195 100644 --- a/config-files/syslog-ng-config/files/syslog-ng.logrotate +++ b/config-files/syslog-ng-config/files/syslog-ng.logrotate @@ -33,6 +33,7 @@ /var/log/snmp-api.log /var/log/dcmanager/*.log /var/log/dcorch/*.log +/var/log/barbican/*.log { nodateext size 10M diff --git a/tools/collector/centos/build_srpm.data b/tools/collector/centos/build_srpm.data index 66f0fdbd8..51df01b68 100644 --- a/tools/collector/centos/build_srpm.data +++ b/tools/collector/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="scripts" -TIS_PATCH_VER=25 +TIS_PATCH_VER=26 diff --git a/tools/collector/scripts/collect_mask_passwords b/tools/collector/scripts/collect_mask_passwords index 0dd5fa9ab..1bdd34cb6 100644 --- a/tools/collector/scripts/collect_mask_passwords +++ b/tools/collector/scripts/collect_mask_passwords @@ -11,6 +11,7 @@ EXTRA_DIR=$2 # Strip the passwords from assorted config files for conffile in \ ${COLLECT_NAME_DIR}/etc/aodh/aodh.conf \ + ${COLLECT_NAME_DIR}/etc/barbican/barbican.conf \ ${COLLECT_NAME_DIR}/etc/ceilometer/ceilometer.conf \ ${COLLECT_NAME_DIR}/etc/cinder/cinder.conf \ ${COLLECT_NAME_DIR}/etc/fm/fm.conf \ diff --git a/tools/engtools/hostdata-collectors/centos/build_srpm.data b/tools/engtools/hostdata-collectors/centos/build_srpm.data index ac9c374eb..1f1cafb47 100644 --- a/tools/engtools/hostdata-collectors/centos/build_srpm.data +++ b/tools/engtools/hostdata-collectors/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="scripts" -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 diff --git a/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf b/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf index a6c06eac6..4002cba61 100644 --- a/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf +++ b/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf @@ -63,7 +63,7 @@ FAST_POSTGRES_CONNECTIONS=N AUTO_DELETE_DB=N [ControllerServices] -CONTROLLER_SERVICE_LIST=aodh-api aodh-listener aodh-notifier aodh-evaluator beam.smp ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-mem-db ceph-mon ceph-rest-api ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry gnocchi-api gnocchi-metricd heat-api heat-engine heat-api-cfn heat-api-cloudwatch hbsAgent ironic-api ironic-conductor magnum-api magnum-conductor neutron-server nova-api nova-api-proxy nova-compute nova-scheduler nova-conductor nova-console-auth nova-novncproxy nova-placement-api panko-api sysinv-api sysinv-conductor postgres fmManager rabbitmq-server gunicorn postgres snmpd patch-alarm-manager lighttpd sw-patch-controller-daemon nfv-vim nfv-vim-api nfv-vim-webserver slapd mtcAgent guestAgent dcmanager-api dcmanager-manager dcorch-engine dcorch-neutron-api-proxy dcorch-nova-api-proxy dcorch-patch-api-proxy dcorch-snmp dcorch-sysinv-api-proxy memcached influxd +CONTROLLER_SERVICE_LIST=aodh-api aodh-listener aodh-notifier aodh-evaluator barbican-api barbican-keystone-listener barbican-worker beam.smp ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-mem-db ceph-mon ceph-rest-api ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry gnocchi-api gnocchi-metricd heat-api heat-engine heat-api-cfn heat-api-cloudwatch hbsAgent ironic-api ironic-conductor magnum-api magnum-conductor neutron-server nova-api nova-api-proxy nova-compute nova-scheduler nova-conductor nova-console-auth nova-novncproxy nova-placement-api panko-api sysinv-api sysinv-conductor postgres fmManager rabbitmq-server gunicorn postgres snmpd patch-alarm-manager lighttpd sw-patch-controller-daemon nfv-vim nfv-vim-api nfv-vim-webserver slapd mtcAgent guestAgent dcmanager-api dcmanager-manager dcorch-engine dcorch-neutron-api-proxy dcorch-nova-api-proxy dcorch-patch-api-proxy dcorch-snmp dcorch-sysinv-api-proxy memcached influxd [ComputeServices] COMPUTE_SERVICE_LIST=nova-compute neutron-dhcp-agent neutron-metadata-agent neutron-sriov-nic-agent kvm libvirtd guestServer host_agent dmeventd virtlockd @@ -81,7 +81,7 @@ COMMON_SERVICE_LIST=dnsmasq ceilometer-polling haproxy hwmond pmond rmond fsmond STATIC_SERVICE_LIST=occtop memtop schedtop top.sh iostat.sh netstats.sh diskstats.sh memstats.sh filestats.sh ceph.sh postgres.sh rabbitmq.sh vswitch.sh [OpenStackServices] -OPEN_STACK_SERVICE_LIST=nova cinder aodh ceilometer heat glance ceph horizon keystone puppet sysinv neutron nova_api postgres panko nova_cell0 magnum ironic murano gnocchi +OPEN_STACK_SERVICE_LIST=nova cinder aodh barbican ceilometer heat glance ceph horizon keystone puppet sysinv neutron nova_api postgres panko nova_cell0 magnum ironic murano gnocchi [SkipList] SKIP_LIST=ps top sh curl awk wc sleep lsof cut grep ip tail su @@ -95,5 +95,5 @@ RABBIT_PORT_NUMBER=5672 # The api stats data structure has three fields: the name displayed in ps -ef, the name displayed in lsof -Pn -i tcp and the specific api port of the service. [ApiStatsServices] -API_STATS_STRUCTURE=ironic-conductor;ironic-co;|ironic-api;ironic-ap;6485|radosgw-swift;radosgw;8|magnum-conductor;magnum-co;|magnum-api;magnum-ap;9511|murano-api;murano-ap;8082|murano-engine;murano-en;|keystone-public;gunicorn;5000|openstack_dashboard.wsgi;gunicorn;8080|gnocchi-api;gunicorn;8041|aodh-api;gunicorn;8042|panko-api;gunicorn;8977|sysinv-conductor;sysinv-co ;|neutron-server;neutron-s;9696|nova-conductor;nova-cond ;|sysinv-agent;sysinv-ag;|sysinv-api;sysinv-ap;6385|nova-api;nova-api ;18774|cinder-api;cinder-a;8776|glance-api;glance-a;9292|vim;nfv-vim;4545|heat-api;heat-a;8004|heat-engine;heat-e;8004 +API_STATS_STRUCTURE=ironic-conductor;ironic-co;|ironic-api;ironic-ap;6485|radosgw-swift;radosgw;8|magnum-conductor;magnum-co;|magnum-api;magnum-ap;9511|murano-api;murano-ap;8082|murano-engine;murano-en;|keystone-public;gunicorn;5000|openstack_dashboard.wsgi;gunicorn;8080|gnocchi-api;gunicorn;8041|aodh-api;gunicorn;8042|panko-api;gunicorn;8977|sysinv-conductor;sysinv-co ;|neutron-server;neutron-s;9696|nova-conductor;nova-cond ;|sysinv-agent;sysinv-ag;|sysinv-api;sysinv-ap;6385|nova-api;nova-api ;18774|cinder-api;cinder-a;8776|glance-api;glance-a;9292|vim;nfv-vim;4545|heat-api;heat-a;8004|heat-engine;heat-e;8004|barbican-api;gunicorn;9311 diff --git a/tools/engtools/parsers/common/parse-all.sh b/tools/engtools/parsers/common/parse-all.sh index 754079693..46e71dd1d 100755 --- a/tools/engtools/parsers/common/parse-all.sh +++ b/tools/engtools/parsers/common/parse-all.sh @@ -95,7 +95,7 @@ function parse_controller_specific { LOG "Parsing postgres data for ${NODE}" if [ -z "${DATABASE_LIST}" ]; then WARNLOG "DATABASE_LIST is not set in the lab.conf file. Use default setting" - DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh postgres nova_api" + DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh barbican postgres nova_api" fi for DB in ${DATABASE_LIST}; do diff --git a/tools/engtools/parsers/common/parse-postgres.sh b/tools/engtools/parsers/common/parse-postgres.sh index 982412336..f373c3868 100755 --- a/tools/engtools/parsers/common/parse-postgres.sh +++ b/tools/engtools/parsers/common/parse-postgres.sh @@ -14,7 +14,7 @@ PARSERDIR=$(dirname $0) if [ -z "${DATABASE_LIST}" ]; then WARNLOG "DATABASE_LIST is not set in the lab.conf file. Use default setting" - DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh postgres nova_api" + DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh barbican postgres nova_api" fi # Do all files if no files specified diff --git a/tools/engtools/parsers/host.conf b/tools/engtools/parsers/host.conf index 338361d4d..4d01410ce 100644 --- a/tools/engtools/parsers/host.conf +++ b/tools/engtools/parsers/host.conf @@ -27,6 +27,7 @@ PLATFORM_CPU_LIST="0 22" ############################################################################################ # Controller services that are of interest are: # AODH: aodh-api, aodh-listener, aodh-notifier, aodh-evaluator +# BARBICAN: barbican-api, barbican-keystone-listener, barbican-worker # CEILOMETER: ceilometer-api, ceilometer-collector, ceilometer-agent-notification, ceilometer-polling, ceilometer-mem-db # CEPH: ceph-mon, ceph-rest, ceph-alarm-manager # CINDER: cinder-api, cinder-volume, cinder-scheduler @@ -51,7 +52,7 @@ PLATFORM_CPU_LIST="0 22" # # Sample configuration below is for the controller host ############################################################################################ -SERVICE_LIST="aodh-api aodh-listener aodh-notifier aodh-evaluator ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-polling ceilometer-mem-db ceph-mon ceph-rest ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry heat-api heat-engine keystone-all neutron-server nova-api nova-scheduler nova-conductor openstack_dashboard sysinv-api sysinv-agent sysinv-conductor postgres beam.smp libvirtd rabbitmq-server fmManager lighttpd dnsmasq" +SERVICE_LIST="aodh-api aodh-listener aodh-notifier aodh-evaluator barbican-api barbican-keystone-listener barbican-worker ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-polling ceilometer-mem-db ceph-mon ceph-rest ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry heat-api heat-engine keystone-all neutron-server nova-api nova-scheduler nova-conductor openstack_dashboard sysinv-api sysinv-agent sysinv-conductor postgres beam.smp libvirtd rabbitmq-server fmManager lighttpd dnsmasq" ############################################################################################ # NETSTATS_INTERFACE_LIST config parameter is used to generate netstats csv diff --git a/tools/engtools/parsers/lab.conf b/tools/engtools/parsers/lab.conf index 2e6d5c7bf..98209f012 100644 --- a/tools/engtools/parsers/lab.conf +++ b/tools/engtools/parsers/lab.conf @@ -42,7 +42,7 @@ BATCH_SIZE=25 # # Currently the Excel file that produces postgres connection charts expects the following # database listed in the specified order: -# DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh postgres nova_api" +# DATABASE_LIST="cinder glance keystone nova neutron ceilometer heat sysinv aodh barbican postgres nova_api" # # which is not in the same order as psql \l command. Please keep the DATABASE_LIST setting # in the conf file empty until this is corrected. diff --git a/utilities/platform-util/centos/build_srpm.data b/utilities/platform-util/centos/build_srpm.data index 1aafbdbd6..880171162 100644 --- a/utilities/platform-util/centos/build_srpm.data +++ b/utilities/platform-util/centos/build_srpm.data @@ -1,4 +1,4 @@ SRC_DIR="platform-util" COPY_LIST_TO_TAR="scripts" -TIS_PATCH_VER=14 +TIS_PATCH_VER=15 diff --git a/utilities/platform-util/scripts/patch-restart-processes b/utilities/platform-util/scripts/patch-restart-processes index f730627aa..948b4b1c9 100755 --- a/utilities/platform-util/scripts/patch-restart-processes +++ b/utilities/platform-util/scripts/patch-restart-processes @@ -218,6 +218,16 @@ do "aodh-notifier") process_list=(${process_list[@]} "sm:aodh-notifier:aodh-notifier:controller:/var/run/resource-agents/aodh-notifier.pid:0") ;; + # Barbican processes + "barbican-api") + process_list=(${process_list[@]} "sm:barbican-api:barbican-api:controller:/var/run/barbican/pid:0") + ;; + "barbican-keystone-listener") + process_list=(${process_list[@]} "sm:barbican-keystone-listener:barbican-keystone-listener:controller:/var/run/resource-agents/barbican-keystone-listener.pid:0") + ;; + "barbican-worker") + process_list=(${process_list[@]} "sm:barbican-worker:barbican-worker:controller:/var/run/resource-agents/barbican-worker.pid:0") + ;; # Panko process "panko-api") process_list=(${process_list[@]} "sm:panko-api:panko-api:controller:/var/run/resource-agents/panko-api.pid:0")