Skip to content

Commit

Permalink
Merge pull request #230 from sensu/mho-CL-patch-1
Browse files Browse the repository at this point in the history
EOL Updates
  • Loading branch information
jaredledvina authored Jan 8, 2020
2 parents 75d8bf1 + fba839b commit 357ee17
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 15 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/)
The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [Unreleased]
## Changed
- Update all package URLs to new EOL domain (@mho-CL & @jaredledvina)
- Update README with EOL status of Sensu Core (@jaredledvina)
- Debian/Ubuntu: Upgrade Erlang to 21.3 for compatibility w/ rabbitmq-server (@jaredledvina)
- Fedora/CentOS: Ensure chkconfig is installed for Uchiwa support on Fedora 30

## [5.4.0] - 2019-07-20
## Changed
Expand Down
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@

[![Join the chat at https://slack.sensu.io/](https://slack.sensu.io/badge.svg)](https://slack.sensu.io/)

This role deploys a full [Sensu](https://sensu.io) stack, a modern, open source monitoring framework.
This role deploys a full [Sensu Core](https://sensu.io) stack, a modern, open source monitoring framework.

## End of Life

Please note that this role solely deploys Sensu Core which has reached end of life status.

For more details, please checkout https://blog.sensu.io/eol-schedule-for-sensu-core-and-enterprise and https://blog.sensu.io/announcing-the-sensu-archives

If you'd like to migrate to Sensu Go, there are docs availible at https://docs.sensu.io/sensu-core/latest/migration/ and
a new officially Ansible Collection supported by [XLab](https://www.xlab.si/?lang=en) available here: https://github.com/sensu/sensu-go-ansible

## Features
- Deploy a full [Sensu](https://sensu.io) stack, including RabbitMQ, redis, and the [Uchiwa dashboard](https://uchiwa.io/#/)
Expand Down
10 changes: 5 additions & 5 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ sensu_enterprise_package: sensu-enterprise
sensu_enterprise_dashboard_package: sensu-enterprise-dashboard

# Sensu repo urls
sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/$releasever/$basearch/"
sensu_yum_key_url: "https://sensu.global.ssl.fastly.net/yum/pubkey.gpg"
sensu_apt_repo_url: "deb https://repositories.sensuapp.org/apt {{ ansible_distribution_release }} main"
sensu_apt_key_url: "https://sensu.global.ssl.fastly.net/apt/pubkey.gpg"
sensu_freebsd_url: "https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/"
sensu_yum_repo_url: "https://eol-repositories.sensuapp.org/yum/$releasever/$basearch/"
sensu_yum_key_url: "https://eol-repositories.sensuapp.org/yum/pubkey.gpg"
sensu_apt_repo_url: "deb https://eol-repositories.sensuapp.org/apt {{ ansible_distribution_release }} main"
sensu_apt_key_url: "https://eol-repositories.sensuapp.org/apt/pubkey.gpg"
sensu_freebsd_url: "https://eol-repositories.sensuapp.org/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/"
sensu_ol_yum_repo_url: "https://dl.fedoraproject.org/pub/epel/$releasever/$basearch/"
sensu_ol_yum_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever"

Expand Down
8 changes: 4 additions & 4 deletions molecule/shared/tests/test_default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
describe port(6379) do
it { should be_listening }
its('protocols') { should include 'tcp' }
its('addresses') { should be_in ['0.0.0.0', '::'] }
its('addresses') { should be_in ['0.0.0.0'] }
end

# RabbitMQ Server
describe port(5671) do
it { should be_listening }
its('protocols') { should include 'tcp' }
its('addresses') { should be_in ['0.0.0.0', '::'] }
its('addresses') { should be_in ['0.0.0.0', '::', '[::]'] }
end

# Sensu API
describe port(4567) do
it { should be_listening }
its('protocols') { should include 'tcp' }
its('addresses') { should be_in ['0.0.0.0', '::'] }
its('addresses') { should be_in ['0.0.0.0'] }
end

# Sensu Client TCP/UDP Socket
Expand All @@ -42,7 +42,7 @@
describe port(3000) do
it { should be_listening }
its('protocols') { should include 'tcp' }
its('addresses') { should be_in ['0.0.0.0', '::'] }
its('addresses') { should be_in ['0.0.0.0', '::', '[::]'] }
end

# Ensure Sensu API has one consumer
Expand Down
5 changes: 4 additions & 1 deletion tasks/CentOS/dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
file: "{{ ansible_distribution }}.yml"
tags: dashboard


- name: Ensure Uchiwa is installed
tags: dashboard
package:
name: uchiwa
name:
- chkconfig
- uchiwa
state: present
when: not se_enterprise

Expand Down
2 changes: 1 addition & 1 deletion vars/Amazon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Define repo url without $releasever
# Define epel version to 6 by default, change to 7 when using a version 2 AMI
epel_version: 6
sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/{{epel_version}}/$basearch/"
sensu_yum_repo_url: "https://eol-repositories.sensuapp.org/yum/{{epel_version}}/$basearch/"

# Set this to false to disable the EPEL repo installation
enable_epel_repo: true
Expand Down
2 changes: 1 addition & 1 deletion vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sensu_redis_pkg_name: redis-server
sensu_redis_service_name: redis-server

sensu_erlang_pin_package: 'esl-erlang erlang*'
sensu_erlang_pin_version: '1:20.3*'
sensu_erlang_pin_version: '1:21.3*'
sensu_rabbitmq_signing_key: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
sensu_rabbitmq_repo: "deb https://dl.bintray.com/rabbitmq/debian {{ ansible_distribution_release }} main"
sensu_rabbitmq_erlang_signing_key: https://packages.erlang-solutions.com/debian/erlang_solutions.asc
Expand Down
2 changes: 1 addition & 1 deletion vars/Fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Defaults are defined in defaults/main.yml

# RH/Centos 7 version works for Fedora 25 as a client
sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/7/$basearch/"
sensu_yum_repo_url: "https://eol-repositories.sensuapp.org/yum/7/$basearch/"
sensu_rabbitmq_repo_version: v3.7.x
sensu_rabbitmq_erlang_repo_version: 20
sensu_rabbitmq_signing_key: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
Expand Down
2 changes: 1 addition & 1 deletion vars/Ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sensu_redis_service_name: redis-server


sensu_erlang_pin_package: 'esl-erlang erlang*'
sensu_erlang_pin_version: '1:20.3*'
sensu_erlang_pin_version: '1:21.3*'
sensu_rabbitmq_signing_key: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
sensu_rabbitmq_repo: "deb https://dl.bintray.com/rabbitmq/debian {{ ansible_distribution_release }} main"
sensu_rabbitmq_erlang_signing_key: https://packages.erlang-solutions.com/debian/erlang_solutions.asc
Expand Down

0 comments on commit 357ee17

Please sign in to comment.