Merge "Remove sensu-client service"

README.rst

@@ -136,8 +136,6 @@ and should be executed according to the following table:
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
 | collectd       |        |    X   |        |        |        |        |        |        |        |        |        |
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
-| sensu-client   |        |    X   |        |        |        |        |        |        |        |        |        |
-+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
 | designate      |        |        |        |    X   |        |        |        |        |        |        |        |
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
 | octavia        |        |        |        |        |        |        |        |        |    X   |        |        |

ci/environments/scenario001-multinode-containers.yaml

@@ -20,10 +20,6 @@ resource_registry:
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
   #Needs to run scenario001
-  # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
-  #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
-  #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
@@ -92,7 +88,6 @@ parameter_defaults:
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
-    #- OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Iscsid
     - OS::TripleO::Services::Multipathd
 
@@ -167,9 +162,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
-  #MonitoringRabbitHost: 127.0.0.1
-  #MonitoringRabbitPort: 5676
-  #MonitoringRabbitPassword: sensu
   RsyslogElasticsearchSetting:
     Server: '127.0.0.1:9200'
   TtyValues:

ci/environments/scenario001-standalone.yaml

@@ -25,11 +25,6 @@ resource_registry:
   OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
-  #Needs to run scenario001
-  # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
-  #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
-  #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
@@ -114,9 +109,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
-  MonitoringRabbitHost: 127.0.0.1
-  MonitoringRabbitPort: 5676
-  MonitoringRabbitPassword: sensu
   TtyValues:
     - console
     - tty1

ci/environments/scenario004-standalone.yaml

@@ -28,10 +28,6 @@ resource_registry:
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::LoginDefs: ../../deployment/login-defs/login-defs-baremetal.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
-  # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
-  #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
-  #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
@@ -91,9 +87,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
-  MonitoringRabbitHost: 127.0.0.1
-  MonitoringRabbitPort: 5676
-  MonitoringRabbitPassword: sensu
   TtyValues:
     - console
     - tty1

ci/environments/scenario010-standalone.yaml

@@ -6,10 +6,6 @@ resource_registry:
   OS::TripleO::Services::Keepalived: OS::Heat::None
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
-  # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
-  #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
-  #  will implement default connection to overcloud RabbitMQ instance,
-  #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
   # Since the OVB jobs also test this functionality we can shut it off here.
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
@@ -87,9 +83,6 @@ parameter_defaults:
   LoggingServers:
     - host: 127.0.0.1
       port: 24224
-  MonitoringRabbitHost: 127.0.0.1
-  MonitoringRabbitPort: 5676
-  MonitoringRabbitPassword: sensu
   TtyValues:
     - console
     - tty1

deployed-server/deployed-server-roles-data.yaml

@@ -172,7 +172,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
@@ -259,7 +258,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
@@ -312,7 +310,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
@@ -365,7 +362,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftRingBuilder
@@ -413,7 +409,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

deployment/deprecated/monitoring/sensu-base.yaml

@@ -1,117 +0,0 @@
-heat_template_version: rocky
-
-description: Sensu base service
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  MonitoringRabbitCluster:
-    description: RabbitMQ cluster configuration Sensu has to connect to.
-    type: json
-    default: []
-  MonitoringRabbitHost:
-    description: RabbitMQ host Sensu has to connect to.
-    type: string
-    default: ''
-  MonitoringRabbitPort:
-    default: 5672
-    description: Set RabbitMQ subscriber port, change this if using SSL.
-    type: number
-  MonitoringRabbitUseSSL:
-    default: false
-    description: >
-        RabbitMQ client subscriber parameter to specify an SSL connection
-        to the RabbitMQ host. Set MonitoringRabbitUseSSL to true without
-        specifying a private key or cert chain to use SSL transport,
-        but not cert auth.
-    type: boolean
-  MonitoringRabbitSSLPrivateKey:
-    default: ''
-    description: Private key to be used by Sensu to connect to RabbitMQ host.
-    type: string
-  MonitoringRabbitSSLCertChain:
-    default: ''
-    description: >
-      Private SSL cert chain to be used by Sensu to connect to RabbitMQ host.
-    type: string
-  MonitoringRabbitPassword:
-    description: The RabbitMQ password used for monitoring purposes.
-    type: string
-    hidden: true
-    default: sensu
-  MonitoringRabbitUserName:
-    description: The RabbitMQ username used for monitoring purposes.
-    type: string
-    default: sensu
-  MonitoringRabbitVhost:
-    description: The RabbitMQ vhost used for monitoring purposes.
-    type: string
-    default: '/sensu'
-  SensuRedactVariables:
-    description: Variables from Sensu configuration, which have to be redacted.
-    type: comma_delimited_list
-    default:
-      - password
-      - passwd
-      - pass
-      - api_key
-      - api_token
-      - access_key
-      - secret_key
-      - private_key
-      - secret
-
-conditions:
-  not_cluster_connection:
-    equals: [{get_param: MonitoringRabbitCluster}, []]
-
-outputs:
-  role_data:
-    description: Role data for the Sensu role.
-    value:
-      service_name: sensu_base
-      config_settings:
-        map_merge:
-          - sensu::enterprise: false
-            sensu::enterprise_dashboard: false
-            sensu::install_repo: false
-            sensu::manage_user: false
-            sensu::redact: {get_param: SensuRedactVariables}
-            sensu::sensu_plugin_provider: 'yum'
-            sensu::sensu_plugin_name: 'rubygem-sensu-plugin'
-            sensu::version: 'present'
-          - if:
-            - not_cluster_connection
-            - sensu::rabbitmq_host: {get_param: MonitoringRabbitHost}
-              sensu::rabbitmq_port: {get_param: MonitoringRabbitPort}
-              sensu::rabbitmq_user: {get_param: MonitoringRabbitUserName}
-              sensu::rabbitmq_password: {get_param: MonitoringRabbitPassword}
-              sensu::rabbitmq_vhost: {get_param: MonitoringRabbitVhost}
-              sensu::rabbitmq_ssl: {get_param: MonitoringRabbitUseSSL}
-              sensu::rabbitmq_ssl_private_key: {get_param: MonitoringRabbitSSLPrivateKey}
-              sensu::rabbitmq_ssl_cert_chain: {get_param: MonitoringRabbitSSLCertChain}
-            - sensu::rabbitmq_cluster: {get_param: MonitoringRabbitCluster}

deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

@@ -1,261 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Containerized Sensu client service.
-  This service is deprecated and will be remove in future releases.
-
-parameters:
-  ContainerSensuClientImage:
-    description: image
-    type: string
-  ContainerSensuConfigImage:
-    description: The container image to use for the sensu config_volume
-    type: string
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  SensuDockerCheckCommand:
-    type: string
-    default: |
-      output=''
-      for i in $(docker ps --format '{{.ID}}'); do
-        if result=$(docker inspect --format='{{.State.Health.Status}}' $i 2>/dev/null); then
-          if [ "$result" != 'healthy' ]; then
-            output="${output} ; $(docker inspect --format='{{.Name}}' $i) ($i): $(docker inspect --format='{{(index .State.Health.Log 0).Output}}' $i)";
-          fi
-        fi
-      done
-      if [ ! -z "${output}" ]; then
-        echo ${output:3} && exit 2;
-      fi
-  SensuPodmanCheckCommand:
-    type: string
-    default: |
-      output=''
-      for i in $(systemctl list-timers --no-pager --no-legend "tripleo*healthcheck.timer" | awk '{print $14}'); do
-        i=${i%.timer}
-        if result=$(systemctl show $i --property=ActiveState | awk '{split($0,a,/=/); print a[2]}'); then
-          if [ "$result" == 'failed' ]; then
-            timestamp=$(systemctl show $i --property=InactiveEnterTimestamp | awk '{print $2, $3}' )
-            log=$(journalctl -u $i -t podman --since "${timestamp}" --no-pager --output=cat --directory /var/log/journal)
-            if [ !  -z  "$output" ]; then
-              output="$i: $log ; $output"
-            else
-              output="$i: $log"
-            fi
-          fi
-        fi
-      done
-      if [ ! -z "${output}" ]; then
-        echo ${output:3} && exit 2;
-      fi
-  SensuDockerCheckInterval:
-    type: number
-    description: The frequency in seconds the docker health check is executed.
-    default: 10
-  SensuDockerCheckHandlers:
-    default: []
-    description: The Sensu event handler to use for events
-                 created by the docker health check.
-    type: comma_delimited_list
-  SensuDockerCheckOccurrences:
-    type: number
-    description: The number of event occurrences before sensu-plugin-aware handler should take action.
-    default: 3
-  SensuDockerCheckRefresh:
-    type: number
-    description: The number of seconds sensu-plugin-aware handlers should wait before taking second action.
-    default: 90
-  ContainerCli:
-    type: string
-    default: 'podman'
-    description: CLI tool used to manage containers.
-    constraints:
-      - allowed_values: ['docker', 'podman']
-  AdminPassword:
-    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
-    type: string
-    hidden: true
-  KeystoneRegion:
-    default: 'regionOne'
-    description: Keystone region for endpoint
-    type: string
-  SensuClientCustomConfig:
-    default: {}
-    description: Hash containing custom sensu-client variables.
-    type: json
-    label: Custom configuration for Sensu Client variables
-
-conditions:
-  docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
-
-resources:
-  ContainersCommon:
-    type: ../../containers-common.yaml
-
-  SensuBase:
-    type: ./sensu-base.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the Sensu client role.
-    value:
-      service_name: sensu_client
-      config_settings:
-        map_merge:
-          - get_attr: [SensuBase, role_data, config_settings]
-          - sensu::api: false
-            sensu::client: true
-            sensu::server: false
-            sensu::client_custom:
-              map_merge:
-                - {get_param: SensuClientCustomConfig}
-                - openstack:
-                    username: 'admin'
-                    password: {get_param: AdminPassword}
-                    auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
-                    tenant_name: 'admin'
-                    region: {get_param: KeystoneRegion}
-          - sensu::checks:
-              check-container-health:
-                standalone: true
-                command:
-                  if:
-                    - docker_enabled
-                    - {get_param: SensuDockerCheckCommand}
-                    - {get_param: SensuPodmanCheckCommand}
-                interval: {get_param: SensuDockerCheckInterval}
-                handlers: {get_param: SensuDockerCheckHandlers}
-                occurrences: {get_param: SensuDockerCheckOccurrences}
-                refresh: {get_param: SensuDockerCheckRefresh}
-      service_config_settings: {}
-      # BEGIN DOCKER SETTINGS
-      puppet_config:
-        config_volume: sensu
-        puppet_tags:  sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
-        step_config: include ::tripleo::profile::base::monitoring::sensu
-        config_image: {get_param: ContainerSensuConfigImage}
-      kolla_config:
-        /var/lib/kolla/config_files/sensu-client.json:
-          command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
-          config_files:
-            - source: "/var/lib/kolla/config_files/src/*"
-              dest: "/"
-              merge: true
-              preserve_properties: true
-          permissions:
-            - path: /var/log/sensu
-              owner: sensu:sensu
-              recurse: true
-      docker_config:
-        step_3:
-          sensu_client:
-            image: {get_param: ContainerSensuClientImage}
-            net: host
-            pid: host
-            # NOTE(mmagr) kolla image changes the user to 'sensu', we need it
-            # to be root have rw permission to docker.sock to run successfully
-            # "docker inspect" command
-            user: root
-            restart: always
-            healthcheck:
-              test:
-                list_join:
-                  - ' '
-                  - - '/openstack/healthcheck'
-                    - yaql:
-                        expression: >
-                          switch(bool($.data.cluster) => $.data.cluster, bool($.data.single_node) => $.data.single_node).select($.port).distinct().join(' ')
-                        data:
-                          cluster: {get_attr: [SensuBase, role_data, config_settings, 'sensu::rabbitmq_cluster']}
-                          single_node: [{port: {get_attr: [SensuBase, role_data, config_settings, 'sensu::rabbitmq_port']}}]
-            volumes:
-              list_concat:
-                - {get_attr: [ContainersCommon, volumes]}
-                -
-                  if:
-                    - docker_enabled
-                    - - /var/run/docker.sock:/var/run/docker.sock:rw
-                    - - /var/log/journal:/var/log/journal:ro
-                      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-                      - /run:/run:rw
-                      - /usr/lib/systemd/system:/usr/lib/systemd/system:ro
-                - - /var/lib/kolla/config_files/sensu-client.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/sensu/:/var/lib/kolla/config_files/src:ro
-                  - /var/log/containers/sensu:/var/log/sensu:rw
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-      host_prep_tasks:
-        - name: create persistent directories
-          file:
-            path: "{{ item.path }}"
-            state: directory
-            setype: "{{ item.setype }}"
-          with_items:
-            - { 'path': /var/log/containers/sensu, 'setype': svirt_sandbox_file_t }
-            - { 'path': /var/log/sensu, 'setype': svirt_sandbox_file_t }
-        - name: sensu logs readme
-          copy:
-            dest: /var/log/sensu/readme.txt
-            content: |
-              Log files from sensu containers can be found under
-              /var/log/containers/sensu.
-          ignore_errors: true
-      # TODO: Removal of package
-      upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - sensu_client
-            tripleo_container_cli: "docker"
-      fast_forward_upgrade_tasks:
-        - when:
-            - step|int == 0
-            - release == 'ocata'
-          block:
-            - name: Check if sensu client is  deployed
-              command: systemctl is-enabled --quiet sensu-client
-              ignore_errors: True
-              register: sensu_enabled_result
-            - name: Set fact sensu_enabled
-              set_fact:
-                sensu_enabled: "{{ sensu_enabled_result.rc == 0 }}"
-        - name: Stop and disable sensu-client service
-          when:
-            - step|int == 1
-            - release == 'ocata'
-            - sensu_enabled|bool
-          service: name=sensu-client state=stopped enabled=no

environments/computealt.yaml

@@ -8,9 +8,6 @@ resource_registry:
   OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml
   OS::TripleO::Services::NovaLibvirtAlt: ../deployment/nova/nova-libvirt-container-puppet.yaml
   OS::TripleO::Services::NovaMigrationTargetAlt: ../deployment/nova/nova-migration-target-container-puppet.yaml
-  OS::TripleO::Services::SensuClientAlt: OS::Heat::None
-  # If enabling monitoring you'll need provide the following in a specific resource_registry
-  # OS::TripleO::Services::SensuClientAlt: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
   OS::TripleO::Services::OVNControllerAlt: OS::Heat::None
   # If enabling OVN you'll need provide the following in a specific resource_registry
   # OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml

environments/hyperconverged-ceph.yaml

@@ -42,7 +42,6 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::Tuned
     - OS::TripleO::Services::OpenDaylightOvs
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::IpaClient
     - OS::TripleO::Services::Ipsec

environments/monitoring-environment.yaml

@@ -1,18 +0,0 @@
-## DEPRECATED
-## Sensu service is deprecated and will be removed in future releases.
-## A Heat environment file which can be used to set up monitoring agents
-
-resource_registry:
-  OS::TripleO::Services::SensuClient: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
-
-#parameter_defaults:
-#  MonitoringRabbitHost: 10.10.10.10
-#  MonitoringRabbitPort: 5672
-#  MonitoringRabbitUserName: sensu
-#  MonitoringRabbitPassword: sensu
-#  MonitoringRabbitUseSSL: false
-#  MonitoringRabbitVhost: "/sensu"
-#  SensuClientCustomConfig:
-#    api:
-#      warning: 10
-#      critical: 20

environments/services-baremetal/sensu-client.yaml

@@ -1,3 +0,0 @@
-
-resource_registry:
-  OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

environments/services/sensu-client.yaml

@@ -1,3 +0,0 @@
-
-resource_registry:
-  OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

environments/undercloud/undercloud-minion.yaml

@@ -220,7 +220,6 @@ resource_registry:
   OS::TripleO::Services::SaharaApi: OS::Heat::None
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
   OS::TripleO::Services::Securetty: OS::Heat::None
-  OS::TripleO::Services::SensuClient: OS::Heat::None
   OS::TripleO::Services::SkydiveAgent: OS::Heat::None
   OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
   OS::TripleO::Services::Snmp: OS::Heat::None

overcloud-resource-registry-puppet.j2.yaml

@@ -279,7 +279,6 @@ resource_registry:
   OS::TripleO::Services::OpenStackClients: OS::Heat::None
   OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
   OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
-  OS::TripleO::Services::SensuClient: OS::Heat::None
   OS::TripleO::Services::TLSProxyBase: OS::Heat::None
   OS::TripleO::Services::Zaqar: OS::Heat::None
   OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None

overcloud.j2.yaml

@@ -571,7 +571,6 @@ resources:
         role_extraconfig:
           map_merge:
             - tripleo::profile::base::metrics::collectd::sensubility::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
-            - sensu::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
 {%- if role.deprecated_param_extraconfig is defined %}
             - {get_param: {{role.deprecated_param_extraconfig}}}
 {%- endif %}

roles/BlockStorage.yaml

@@ -38,7 +38,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles/CellController.yaml

@@ -53,7 +53,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/CephAll.yaml

@@ -39,7 +39,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles/CephFile.yaml

@@ -35,7 +35,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles/CephObject.yaml

@@ -35,7 +35,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles/CephStorage.yaml

@@ -34,7 +34,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles/Compute.yaml

@@ -68,7 +68,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeAlt.yaml

@@ -44,7 +44,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClientAlt
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeDVR.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeHCI.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeHCIOvsDpdk.yaml

@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeInstanceHA.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeLiquidio.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeLocalEphemeral.yaml

@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeOvsDpdk.yaml

@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeOvsDpdkRT.yaml

@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeOvsDpdkSriov.yaml

@@ -53,7 +53,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeOvsDpdkSriovRT.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputePPC64LE.yaml

@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeRBDEphemeral.yaml

@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeRealTime.yaml

@@ -61,7 +61,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeSriov.yaml

@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ComputeSriovRT.yaml

@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/Controller.yaml

@@ -169,7 +169,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerAllNovaStandalone.yaml

@@ -116,7 +116,6 @@
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerNoCeph.yaml

@@ -161,7 +161,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerNovaStandalone.yaml

@@ -137,7 +137,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerOpenstack.yaml

@@ -129,7 +129,6 @@
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerStorageDashboard.yaml

@@ -170,7 +170,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/ControllerStorageNfs.yaml

@@ -169,7 +169,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/Database.yaml

@@ -31,7 +31,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Timesync
     - OS::TripleO::Services::Timezone

roles/DistributedCompute.yaml

@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/DistributedComputeHCI.yaml

@@ -62,7 +62,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/HciCephAll.yaml

@@ -62,7 +62,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/HciCephFile.yaml

@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/HciCephMon.yaml

@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/HciCephObject.yaml

@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/IronicConductor.yaml

@@ -31,7 +31,6 @@
     - OS::TripleO::Services::Podman
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Timesync
     - OS::TripleO::Services::Timezone

roles/Messaging.yaml

@@ -29,7 +29,6 @@
     - OS::TripleO::Services::Podman
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Timesync
     - OS::TripleO::Services::Timezone

roles/Networker.yaml

@@ -46,7 +46,6 @@
     - OS::TripleO::Services::Podman
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/Novacontrol.yaml

@@ -37,7 +37,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd

roles/ObjectStorage.yaml

@@ -42,7 +42,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftRingBuilder

roles/README.rst

@@ -173,7 +173,6 @@ Example
    * OS::TripleO::Services::OpenDaylightOvs
    * OS::TripleO::Services::Podman
    * OS::TripleO::Services::Securetty
-   * OS::TripleO::Services::SensuClient
    * OS::TripleO::Services::Snmp
    * OS::TripleO::Services::Sshd
    * OS::TripleO::Services::Timesync

roles/Standalone.yaml

@@ -168,7 +168,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp

roles/Telemetry.yaml

@@ -44,7 +44,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

roles_data.yaml

@@ -172,7 +172,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
@@ -258,7 +257,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
@@ -310,7 +308,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
@@ -362,7 +359,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftRingBuilder
@@ -409,7 +405,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync

sample-env-generator/undercloud-minion.yaml

@@ -242,7 +242,6 @@ environments:
       OS::TripleO::Services::SaharaEngine: OS::Heat::None
       OS::TripleO::Services::Securetty: OS::Heat::None
       OS::TripleO::Services::SELinux: OS::Heat::None
-      OS::TripleO::Services::SensuClient: OS::Heat::None
       OS::TripleO::Services::SkydiveAgent: OS::Heat::None
       OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
       OS::TripleO::Services::Snmp: OS::Heat::None