Graylog Charm

Merge ~afreiberger/charm-graylog:zaza-nrpe-blocked-status into charm-graylog:master

  1. Git
  2. lp:~afreiberger/charm-graylog
  3. zaza-nrpe-blocked-status
  4. Merge into master
Proposed by Drew Freiberger
Status: Merged
Merged at revision: e62ae269ed78c602b7444b91c51dd35ac4b9b24d
Proposed branch: ~afreiberger/charm-graylog:zaza-nrpe-blocked-status
Merge into: charm-graylog:master
Prerequisite: ~afreiberger/charm-graylog:blacken-20.10
Diff against target: 29 lines (+8/-5)
1 file modified
src/tests/functional/tests/tests.yaml (+8/-5)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+392310@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
2index 1b6afb6..c52c200 100644
3--- a/src/tests/functional/tests/tests.yaml
4+++ b/src/tests/functional/tests/tests.yaml
5@@ -12,12 +12,12 @@ dev_bundles:
6 - gl3: bionic-graylog3
7 tests:
8 - gl2:
9- - tests.test_legacy.LegacyTests
10- - tests.test_graylog_charm.CharmOperationTest
11- - tests.test_graylog_upgrade.UpgradeTest
12+ - tests.test_legacy.LegacyTests
13+ - tests.test_graylog_charm.CharmOperationTest
14+ - tests.test_graylog_upgrade.UpgradeTest
15 - gl3:
16- - tests.test_legacy.LegacyTests
17- - tests.test_graylog_charm.CharmOperationTest
18+ - tests.test_legacy.LegacyTests
19+ - tests.test_graylog_charm.CharmOperationTest
20 target_deploy_status:
21 filebeat:
22 workload-status: active
23@@ -25,3 +25,6 @@ target_deploy_status:
24 haproxy:
25 workload-status: unknown
26 workload-status-message: ""
27+ nrpe:
28+ workload-status: blocked
29+ workload-status-message: Nagios server not configured or related

Subscribers

People subscribed via source and target branches

to all changes: