diff --git a/config-files/syslog-ng-config/files/syslog-ng.conf b/config-files/syslog-ng-config/files/syslog-ng.conf index d3b9d564a..78a42ac4c 100644 --- a/config-files/syslog-ng-config/files/syslog-ng.conf +++ b/config-files/syslog-ng-config/files/syslog-ng.conf @@ -149,53 +149,11 @@ destination d_dcorch { file("/var/log/dcorch/dcorch.log" template(t_openstack)); destination d_dcdbsync { file("/var/log/dcdbsync/dcdbsync.log" template(t_openstack)); }; -# Nova-api-proxy Log destination -destination d_novaapiproxy { file("/var/log/nova/nova-api-proxy.log"); }; - # Openstack Log destinations -destination d_novaapi { file("/var/log/nova/nova-api.log" template(t_openstack)); }; -destination d_novascheduler { file("/var/log/nova/nova-scheduler.log" template(t_openstack)); }; -destination d_novaconductor { file("/var/log/nova/nova-conductor.log" template(t_openstack)); }; -destination d_novaconsole { file("/var/log/nova/nova-consoleauth.log" template(t_openstack)); }; -destination d_novamanage { file("/var/log/nova/nova-manage.log" template(t_openstack)); }; -destination d_novacompute { file("/var/log/nova/nova-compute.log" template(t_openstack)); }; -destination d_novaplacementapi { file("/var/log/nova/nova-placement-api.log" template(t_openstack)); }; -destination d_neutronapi { file("/var/log/neutron/neutron-api.log" template(t_openstack)); }; destination d_horizon { file("/var/log/horizon.log" template(t_openstack)); }; destination d_libvirtd { file("/var/log/libvirt/libvirtd.log" template(t_libvirtd)); }; -destination d_heatapi { file("/var/log/heat/heat-api.log" template(t_openstack)); }; -destination d_heatapicfn { file("/var/log/heat/heat-api-cfn.log" template(t_openstack)); }; -destination d_heatapicloud { file("/var/log/heat/heat-api-cloudwatch.log" template(t_openstack)); }; -destination d_heatengine { file("/var/log/heat/heat-engine.log" template(t_openstack)); }; -destination d_cinderapi { file("/var/log/cinder/cinder-api.log" template(t_openstack)); }; -destination d_cinderscheduler { file("/var/log/cinder/cinder-scheduler.log" template(t_openstack)); }; -destination d_cindervolume { file("/var/log/cinder/cinder-volume.log" template(t_openstack)); }; -destination d_cinderbackup { file("/var/log/cinder/cinder-backup.log" template(t_openstack)); }; destination d_keystoneall { file("/var/log/keystone/keystone-all.log" template(t_openstack)); }; destination d_keystoneapi { file("/var/log/keystone/keystone-api.log" template(t_openstack)); }; -destination d_glanceapi { file("/var/log/glance/glance-api.log" template(t_openstack)); }; -destination d_glanceregistry { file("/var/log/glance/glance-registry.log" template(t_openstack)); }; -destination d_glanceregistryrest { file("/var/log/glance/glance-registry-api.log" template(t_openstack)); }; -# Ceilometer is not using oslo_log so it does not use the t_openstack template -destination d_ceilometeragentnotification { file("/var/log/ceilometer/ceilometer-agent-notification.log"); }; -destination d_ceilometerupgrade { file("/var/log/ceilometer/ceilometer-upgrade.log"); }; -destination d_aodhapi { file("/var/log/aodh/aodh-api.log" template(t_openstack)); }; -destination d_aodhdbsync { file("/var/log/aodh/aodh-dbsync.log" template(t_openstack)); }; -destination d_aodhevaluator { file("/var/log/aodh/aodh-evaluator.log" template(t_openstack)); }; -destination d_aodhexpirer { file("/var/log/aodh/aodh-expirer.log" template(t_openstack)); }; -destination d_aodhlistener { file("/var/log/aodh/aodh-listener.log" template(t_openstack)); }; -destination d_aodhnotifier { file("/var/log/aodh/aodh-notifier.log" template(t_openstack)); }; -destination d_muranoapi { file("/var/log/murano/murano-api.log" template(t_openstack)); }; -destination d_muranoengine { file("/var/log/murano/murano-engine.log" template(t_openstack)); }; -destination d_magnumapi { file("/var/log/magnum/magnum-api.log" template(t_openstack)); }; -destination d_magnumconductor { file("/var/log/magnum/magnum-conductor.log" template(t_openstack)); }; -destination d_ironicapi { file("/var/log/ironic/ironic-api.log" template(t_openstack)); }; -destination d_ironicconductor { file("/var/log/ironic/ironic-conductor.log" template(t_openstack)); }; -destination d_pankoapi { file("/var/log/panko/panko-api.log" template(t_openstack)); }; -destination d_pankodbsync { file("/var/log/panko/panko-dbsync.log" template(t_openstack)); }; -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)); }; @@ -309,39 +267,13 @@ filter f_local0 { facility(local0); }; filter f_local1 { facility(local1) and not program(fmManager); }; filter f_local2 { facility(local2) - and not program(glance-api) - and not program(glance-registry) - and not program(ceilometer-agent-notification) - and not program(ceilometer-upgrade) - and not program(aodh-api) - and not program(aodh-dbsync) - and not program(aodh-evaluator) - and not program(aodh-expirer) - and not program(aodh-listener) - and not program(aodh-notifier) - and not program(panko-api) - and not program(panko-dbsync) - and not program(panko-expirer) - and not program(gnocchi-api) - and not program(gnocchi-metricd) - and not program(murano-api) - and not program(murano-engine) - and not program(magnum-api) - and not program(magnum-conductor) - and not program(ironic-api) - and not program(ironic-conductor) - and not program(cinder-api) - 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); }; + and not filter(f_keystoneapi) }; filter f_local3 { facility(local3); }; filter f_local4 { facility(local4); }; filter f_local5 { facility(local5); }; @@ -374,9 +306,6 @@ filter f_fm_manager { facility(local1) and program(fmManager); }; filter f_ima { facility(auth) and program(audispd) and match("type=INTEGRITY_") ; }; filter f_ima_appraise { filter(f_ima) and match("appraise_data") ; }; -# Nova-api-proxy Log Filter - filter f_novaapiproxy { facility(local5) and program(nova-api-proxy); }; - # Sysinv Log Filter filter f_sysinv { facility(local6) and program(sysinv) and not match("sysinv.api.hooks.auditor"); }; filter f_sysinvapi { facility(local6) and program(sysinv) and match("sysinv.api.hooks.auditor"); }; @@ -392,48 +321,10 @@ filter f_dcorchapiproxy { facility(local2) and program(dcorch-api-proxy); }; filter f_dcdbsyncapi { facility(local2) and program(dcdbsync-api); }; # Openstack Log Filters -filter f_novaapi { facility(local6) and program(nova-api); }; -filter f_novascheduler { facility(local6) and program(nova-scheduler); }; -filter f_novaconductor { facility(local6) and program(nova-conductor); }; -filter f_novaconsole { facility(local6) and program(nova-consoleauth); }; -filter f_novamanage { facility(local6) and program(nova-manage); }; -filter f_novacompute { facility(local6) and program(nova-compute); }; -filter f_novaplacementapi { facility(local6) and program(nova-placement-api); }; -filter f_neutronapi { facility(local2) and program(neutron-server) and match("neutron.wsgi"); }; filter f_horizon { facility(local7) }; filter f_libvirtd { program(libvirtd) }; -filter f_heatapi { facility(local6) and program(heat-api); }; -filter f_heatapicfn { facility(local6) and program(heat-api-cfn); }; -filter f_heatapicloud { facility(local6) and program(heat-api-cloudwatch); }; -filter f_heatengine { facility(local6) and program(heat-engine); }; -filter f_cinderapi { facility(local2) and program(cinder-api); }; -filter f_cinderscheduler { facility(local2) and program(cinder-scheduler); }; -filter f_cindervolume { facility(local2) and program(cinder-volume); }; -filter f_cinderbackup { facility(local2) and program(cinder-backup); }; -filter f_glanceapi { facility(local2) and program(glance-api); }; -filter f_glanceregistry { facility(local2) and program(glance-registry) and not match("eventlet.wsgi.server"); }; -filter f_glanceregistryrest { facility(local2) and program(glance-registry) and match("eventlet.wsgi.server"); }; filter f_keystoneall { facility(local2) and message("keystone.*") and not match("keystone.common.wsgi"); }; filter f_keystoneapi { facility(local2) and match("keystone.common.wsgi"); }; -filter f_ceilometeragentnotification { facility(local2) and program(ceilometer-agent-notification); }; -filter f_ceilometerupgrade { facility(local2) and program(ceilometer-upgrade); }; -filter f_aodhapi { facility(local2) and program(aodh-api); }; -filter f_aodhdbsync { facility(local2) and program(aodh-dbsync); }; -filter f_aodhevaluator { facility(local2) and program(aodh-evaluator); }; -filter f_aodhexpirer { facility(local2) and program(aodh-expirer); }; -filter f_aodhlistener { facility(local2) and program(aodh-listener); }; -filter f_aodhnotifier { facility(local2) and program(aodh-notifier); }; -filter f_muranoapi { facility(local2) and program(murano-api); }; -filter f_muranoengine { facility(local2) and program(murano-engine); }; -filter f_magnumapi { facility(local2) and program(magnum-api); }; -filter f_magnumconductor { facility(local2) and program(magnum-conductor); }; -filter f_pankoapi { facility(local2) and program(panko-api); }; -filter f_pankodbsync { facility(local2) and program(panko-dbsync); }; -filter f_pankoexpirer { facility(local2) and program(panko-expirer); }; -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); }; @@ -512,52 +403,11 @@ log {source(s_src); filter(f_dcorchsnmp); destination(d_dcorch); }; log {source(s_src); filter(f_dcorchapiproxy); destination(d_dcorch); }; log {source(s_src); filter(f_dcdbsyncapi); destination(d_dcdbsync); }; -# Nova-api-proxy Log Path -log {source(s_src); filter(f_novaapiproxy); destination(d_novaapiproxy); }; - # Openstack Log Paths -log { source(s_src); filter(f_novaapi); destination(d_novaapi); }; -log { source(s_src); filter(f_novascheduler); destination(d_novascheduler); }; -log { source(s_src); filter(f_novaconductor); destination(d_novaconductor); }; -log { source(s_src); filter(f_novaconsole); destination(d_novaconsole); }; -log { source(s_src); filter(f_novamanage); destination(d_novamanage); }; -log { source(s_src); filter(f_novacompute); destination(d_novacompute); }; -log { source(s_src); filter(f_novaplacementapi); destination(d_novaplacementapi); }; -log { source(s_src); filter(f_neutronapi); destination(d_neutronapi); }; log { source(s_src); filter(f_horizon); destination(d_horizon); }; log { source(s_src); filter(f_libvirtd); destination(d_libvirtd); }; -log { source(s_src); filter(f_heatapi); destination(d_heatapi); }; -log { source(s_src); filter(f_heatapicfn); destination(d_heatapicfn); }; -log { source(s_src); filter(f_heatapicloud); destination(d_heatapicloud); }; -log { source(s_src); filter(f_heatengine); destination(d_heatengine); }; -log { source(s_src); filter(f_cinderapi); destination(d_cinderapi); }; -log { source(s_src); filter(f_cinderscheduler); destination(d_cinderscheduler); }; -log { source(s_src); filter(f_cindervolume); destination(d_cindervolume); }; -log { source(s_src); filter(f_cinderbackup); destination(d_cinderbackup); }; log { source(s_src); filter(f_keystoneall); destination(d_keystoneall); }; log { source(s_src); filter(f_keystoneapi); destination(d_keystoneapi); }; -log { source(s_src); filter(f_glanceapi); destination(d_glanceapi); }; -log { source(s_src); filter(f_glanceregistry); destination(d_glanceregistry); }; -log { source(s_src); filter(f_glanceregistryrest); destination(d_glanceregistryrest); }; -log { source(s_src); filter(f_ceilometeragentnotification); destination(d_ceilometeragentnotification); }; -log { source(s_src); filter(f_ceilometerupgrade); destination(d_ceilometerupgrade); }; -log { source(s_src); filter(f_aodhapi); destination(d_aodhapi); }; -log { source(s_src); filter(f_aodhdbsync); destination(d_aodhdbsync); }; -log { source(s_src); filter(f_aodhevaluator); destination(d_aodhevaluator); }; -log { source(s_src); filter(f_aodhexpirer); destination(d_aodhexpirer); }; -log { source(s_src); filter(f_aodhlistener); destination(d_aodhlistener); }; -log { source(s_src); filter(f_aodhnotifier); destination(d_aodhnotifier); }; -log { source(s_src); filter(f_muranoapi); destination(d_muranoapi); }; -log { source(s_src); filter(f_muranoengine); destination(d_muranoengine); }; -log { source(s_src); filter(f_magnumapi); destination(d_magnumapi); }; -log { source(s_src); filter(f_magnumconductor); destination(d_magnumconductor); }; -log { source(s_src); filter(f_pankoapi); destination(d_pankoapi); }; -log { source(s_src); filter(f_pankodbsync); destination(d_pankodbsync); }; -log { source(s_src); filter(f_pankoexpirer); destination(d_pankoexpirer); }; -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); }; diff --git a/config-files/syslog-ng-config/files/syslog-ng.logrotate b/config-files/syslog-ng-config/files/syslog-ng.logrotate index db61e0195..ad46a0696 100644 --- a/config-files/syslog-ng-config/files/syslog-ng.logrotate +++ b/config-files/syslog-ng-config/files/syslog-ng.logrotate @@ -22,14 +22,7 @@ /var/log/nfv-vim-api.log /var/log/nfv-vim-webserver.log /var/log/keystone/*.log -/var/log/aodh/*.log -/var/log/murano/*.log -/var/log/magnum/*.log /var/log/horizon.log -/var/log/ceilometer/*.log -/var/log/panko/*.log -/var/log/gnocchi/*.log -/var/log/ironic/*.log /var/log/snmp-api.log /var/log/dcmanager/*.log /var/log/dcorch/*.log @@ -63,67 +56,6 @@ endscript } -/var/log/cinder/*.log -{ - nodateext - size 10M - start 1 - rotate 20 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} - -/var/log/glance/*.log -{ - nodateext - size 10M - start 1 - rotate 20 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} - -/var/log/heat/*.log -{ - nodateext - size 10M - start 1 - rotate 20 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} - -/var/log/neutron/*.log -/var/log/nova/*.log -{ - nodateext - size 50M - start 1 - rotate 20 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} - /var/log/collect.log /var/log/ldapscripts.log /var/log/tuned/tuned.log diff --git a/utilities/platform-util/centos/build_srpm.data b/utilities/platform-util/centos/build_srpm.data index 260eb2124..9d0006ccf 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=16 +TIS_PATCH_VER=17 diff --git a/utilities/platform-util/scripts/patch-restart-processes b/utilities/platform-util/scripts/patch-restart-processes index 713a0c62b..5d7b9db8a 100755 --- a/utilities/platform-util/scripts/patch-restart-processes +++ b/utilities/platform-util/scripts/patch-restart-processes @@ -189,35 +189,10 @@ do "sysinv-agent") process_list=(${process_list[@]} "pmon:sysinv-agent:sysinv-agent:all:/var/run/sysinv-agent.pid:0") ;; - - "ceilometer-polling") - process_list=(${process_list[@]} "pmon:ceilometer-polling:ceilometer-polling:all:/var/run/ceilometer-polling.pid:0") - ;; - "ceilometer-agent-notification") - process_list=(${process_list[@]} "sm:ceilometer-agent-notification:ceilometer-agent-notification:controller:/var/run/resource-agents/ceilometer-agent-notification.pid:0") - ;; - "ceilometer-collector") - process_list=(${process_list[@]} "sm:ceilometer-collector:ceilometer-collector:controller:/var/run/resource-agents/ceilometer-collector.pid:0") - ;; - "ceilometer-api") - process_list=(${process_list[@]} "sm:ceilometer-api:ceilometer-api:controller:/var/run/resource-agents/ceilometer-api.pid:0") - ;; + # Keystone processes "keystone") process_list=(${process_list[@]} "sm:keystone:keystone:controller:/var/run/openstack-keystone.pid:0") ;; - # AODH processes - "aodh-api") - process_list=(${process_list[@]} "sm:aodh-api:aodh-api:controller:/var/run/resource-agents/aodh-api.pid:0") - ;; - "aodh-evaluator") - process_list=(${process_list[@]} "sm:aodh-evaluator:aodh-evaluator:controller:/var/run/resource-agents/aodh-evaluator.pid:0") - ;; - "aodh-listener") - process_list=(${process_list[@]} "sm:aodh-listener:aodh-listener:controller:/var/run/resource-agents/aodh-listener.pid:0") - ;; - "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") @@ -228,48 +203,10 @@ do "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") - ;; - # Murano processes - "murano-engine") - process_list=(${process_list[@]} "sm:murano-engine:murano-engine:controller:/var/run/resource-agents/murano-engine.pid:0") - ;; - "murano-api") - process_list=(${process_list[@]} "sm:murano-api:murano-api:controller:/var/run/resource-agents/murano-api.pid:0") - ;; - # Magnum processes - "magnum-conductor") - process_list=(${process_list[@]} "sm:magnum-conductor:magnum-conductor:controller:/var/run/resource-agent/magnum-conductor.pid:0") - ;; - "magnum-api") - process_list=(${process_list[@]} "sm:magnum-api:magnum-api:controller:/var/run/resource-agents/magnum-api.pid:0") - ;; - # Ironic processes - "ironic-conductor") - process_list=(${process_list[@]} "sm:ironic-conductor:ironic-conductor:controller:/var/run/resource-agents/ironic-conductor.pid:0") - ;; - "ironic-api") - process_list=(${process_list[@]} "sm:ironic-api:ironic-api:controller:/var/run/resource-agents/ironic-api.pid:0") - ;; # IO-Monitor process "io-monitor-manager") process_list=(${process_list[@]} "pmon:io-monitor-manager:io-monitor-manager:controller:/var/run/io-monitor/io-monitor-manager.pid:0") ;; - # HEAT processes - "heat-engine") - process_list=(${process_list[@]} "sm:heat-engine:heat-engine:controller:/var/run/resource-agents/heat-engine.pid:0") - ;; - "heat-api") - process_list=(${process_list[@]} "sm:heat-api:heat-api:controller:/var/run/resource-agents/heat-api.pid:0") - ;; - "heat-api-cfn") - process_list=(${process_list[@]} "sm:heat-api-cfn:heat-api-cfn:controller:/var/run/resource-agents/heat-api-cfn.pid:0") - ;; - "heat-api-cloudwatch") - process_list=(${process_list[@]} "sm:heat-api-cloudwatch:heat-api-cloudwatch:controller:/var/run/resource-agents/heat-api-cloudwatch.pid:0") - ;; # Vim processes "nfv-vim") process_list=(${process_list[@]} "sm:nfv-vim:vim:controller:/var/run/nfv-vim.pid:0") @@ -280,35 +217,6 @@ do "nfv-vim-webserver") process_list=(${process_list[@]} "sm:nfv-vim-webserver:vim-webserver:controller:/var/run/nfv-vim-webserver.pid:0") ;; - # NOVA processes - "nova-api") - process_list=(${process_list[@]} "sm:nova-api:nova-api:controller:/var/run/resource-agents/nova-api.pid:0") - ;; - "nova-placement-api") - process_list=(${process_list[@]} "sm:nova-placement-api:nova-placement-api:controller:/var/run/resource-agents/nova-placement-api.pid:0") - ;; - "nova-conductor") - process_list=(${process_list[@]} "sm:nova-conductor:nova-conductor:controller:/var/run/resource-agents/nova-conductor.pid:0") - ;; - "nova-console-auth") - process_list=(${process_list[@]} "sm:nova-console-auth:nova-console-auth:controller:/var/run/resource-agents/nova-console-auth.pid:0") - ;; - "nova-novnc") - process_list=(${process_list[@]} "sm:nova-novnc:nova-novnc:controller:/var/run/resource-agents/nova-novnc.pid:0") - ;; - "nova-scheduler") - process_list=(${process_list[@]} "sm:nova-scheduler:nova-scheduler:controller:/var/run/resource-agents/nova-scheduler.pid:0") - ;; - "nova-compute") - process_list=(${process_list[@]} "pmon:nova-compute:nova-compute:compute:/var/run/nova/nova-compute.pid:0" "sm:nova-compute:nova-compute:controller:/var/run/resource-agents/nova-compute.pid:0") - ;; - "nova-serialproxy") - process_list=(${process_list[@]} "sm:nova-serialproxy:nova-serialproxy:controller:/var/run/resource-agents/nova-serialproxy.pid:0") - ;; - # NOVA proxy - "nova-api-proxy") - process_list=(${process_list[@]} "sm:nova-api-proxy:nova-api-proxy:controller:/var/run/nova-api-proxy.pid:0") - ;; # Distributed Cloud processes "dcmanager-manager") process_list=(${process_list[@]} "sm:dcmanager-manager:dcmanager-manager:controller:/var/run/resource-agents/dcmanager-manager.pid:0")