File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed
lib/logstash/api/commands
spec/logstash/api/commands Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ def http_address
7171
7272 private
7373 def enabled_xpack_monitoring?
74+ LogStash ::SETTINGS . get_value ( "allow.legacy.monitoring" ) &&
7475 LogStash ::SETTINGS . registered? ( "xpack.monitoring.enabled" ) &&
7576 LogStash ::SETTINGS . get ( "xpack.monitoring.enabled" )
7677 end
Original file line number Diff line number Diff line change @@ -54,13 +54,22 @@ def registerIfNot(setting)
5454 )
5555 end
5656
57- it "check monitoring exist when monitoring is enabled" do
57+ it "check monitoring section exist when legacy monitoring is enabled and allowed" do
58+ LogStash ::SETTINGS . set_value ( "allow.legacy.monitoring" , true )
5859 LogStash ::SETTINGS . set_value ( "xpack.monitoring.enabled" , true )
5960 expect ( report . keys ) . to include (
6061 :monitoring
6162 )
6263 end
6364
65+ it "check monitoring section does not appear when legacy monitoring is not allowed but enabled" do
66+ LogStash ::SETTINGS . set_value ( "allow.legacy.monitoring" , false )
67+ LogStash ::SETTINGS . set_value ( "xpack.monitoring.enabled" , true )
68+ expect ( report . keys ) . not_to include (
69+ :monitoring
70+ )
71+ end
72+
6473 it "check monitoring does not appear when not enabled and nor cluster_uuid is defined" do
6574 LogStash ::SETTINGS . set_value ( "xpack.monitoring.enabled" , false )
6675 LogStash ::SETTINGS . get_setting ( "monitoring.cluster_uuid" ) . reset
You can’t perform that action at this time.
0 commit comments