Skip to content

Commit

Permalink
change TOML yes/no strings to boolean
Browse files Browse the repository at this point in the history
  • Loading branch information
ali-graham committed Nov 4, 2014
1 parent da8a688 commit e53daa8
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 86 deletions.
48 changes: 24 additions & 24 deletions etc/flapjack_config.toml.example
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
pid_dir = "/var/run/flapjack/"
log_dir = "/var/log/flapjack/"
daemonize = "yes"
daemonize = true
[logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
[redis]
host = "127.0.0.1"
port = 6380
db = 0
# Processes monitoring events off the *events* queue (a redis list) and decides
# what actions to take (generate notification event, record state changes, etc)
[processor]
enabled = "yes"
enabled = true
queue = "events"
notifier_queue = "notifications"
archive_events = true
Expand All @@ -26,12 +26,12 @@ daemonize = "yes"
new_check_scheduled_maintenance_ignore_tags = ["bypass_ncsm"]
[processor.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# Processes notification events off the *notifications* queue (a redis list) and
# works out who to notify, and on which media, and with what kind of notification
# message. It then creates jobs for the various notification gateways below.
[notifier]
enabled = "yes"
enabled = true
queue = "notifications"
email_queue = "email_notifications"
sms_queue = "sms_notifications"
Expand All @@ -43,7 +43,7 @@ daemonize = "yes"
default_contact_timezone = "UTC"
[notifier.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
[nagios-receiver]
fifo = "/var/cache/nagios3/event_stream.fifo"
pid_dir = "/var/run/flapjack/"
Expand All @@ -55,12 +55,12 @@ daemonize = "yes"
[gateways]
# Generates email notifications
[gateways.email]
enabled = "no"
enabled = false
# the redis queue this pikelet will look for notifications on
queue = "email_notifications"
[gateways.email.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# these values are passed directly through to EventMachine::Protocols::SmtpClient configuration,
# and can be omitted if the defaults are acceptable
[gateways.email.smtp_config]
Expand All @@ -84,36 +84,36 @@ daemonize = "yes"
# alert.html = "/etc/flapjack/templates/email/alert.html.erb"
# Sends SMS notifications via MessageNet (Australia only)
[gateways.sms]
enabled = "no"
enabled = false
# the redis queue this pikelet will look for notifications on
queue = "sms_notifications"
endpoint = "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage"
username = "ermahgerd"
password = "xxxx"
[gateways.sms.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# location of custom alert templates
#templates:
# rollup_text = "/etc/flapjack/templates/sms/rollup.text.erb"
# alert_text = "/etc/flapjack/templates/sms/alert.text.erb"
# Sends SMS notifications via Twilio
[gateways.sms_twilio]
enabled = "no"
enabled = false
queue = "sms_twilio_notifications"
account_sid = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
auth_token = "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
from = "+1xxxxxxxxxx"
[gateways.sms_twilio.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# location of custom alert templates
#[gateways.sms_twilio.templates]
# rollup_text = "/etc/flapjack/templates/sms_twilio/rollup.text.erb"
# alert_text = "/etc/flapjack/templates/sms_twilio/alert.text.erb"
# Generates SNS notifications
[gateways.sns]
enabled = "no"
enabled = false
queue = "sns_notifications"
#region_name = "us-east-1"
# Don't forget to use an IAM user's credentials here so revocation is easy!
Expand All @@ -122,7 +122,7 @@ daemonize = "yes"
# Connects to an XMPP (jabber) server, sends notifications (to rooms and individuals),
# handles acknowledgements from jabber users and other commands.
[gateways.jabber]
enabled = "no"
enabled = false
# the redis queue this pikelet will look for notifications on
queue = "jabber_notifications"
server = "jabber.example.com"
Expand All @@ -139,26 +139,26 @@ daemonize = "yes"
]
[gateways.jabber.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# location of custom alert templates
#[gateways.jabber.templates]
# rollup_text = "/etc/flapjack/templates/jabber/rollup.text.erb"
# alert_text = "/etc/flapjack/templates/jabber/alert.text.erb"
# Sends notifications to and accepts acknowledgements from [PagerDuty](http://www.pagerduty.com/)
# (NB = "contacts will need to have a registered PagerDuty account to use this)"
[gateways.pagerduty]
enabled = "no"
enabled = false
# the redis queue this pikelet will look for notifications on
queue = "pagerduty_notifications"
[gateways.pagerduty.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# location of custom alert templates
#[gateways.pagerduty.templates]
# alert_text = "/etc/flapjack/templates/pagerduty/alert.text.erb"
# Browsable web interface
[gateways.web]
enabled = "yes"
enabled = true
port = 3080
timeout = 300
# Seconds between auto_refresh of entities/checks pages. Set to 0 to disable
Expand All @@ -169,21 +169,21 @@ daemonize = "yes"
#logo_image_path = "/etc/flapjack/web/custom_logo/flapjack-2013-notext-transparent-300-300.png"
[gateways.web.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# HTTP API server
[gateways.jsonapi]
enabled = "yes"
enabled = true
port = 3081
timeout = 300
access_log = "/var/log/flapjack/jsonapi_access.log"
base_url = "http://localhost:3081/"
[gateways.jsonapi.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
# "out-of-band" end-to-end testing, used for monitoring other instances of
# flapjack to ensure that they are running correctly
[gateways.oobetet]
enabled = "no"
enabled = false
server = "jabber.example.com"
port = 5222
# jabberid, password, alias, rooms = "see the jabber pikelet"
Expand All @@ -203,7 +203,7 @@ daemonize = "yes"
"[email protected]",
"[email protected]",
"[email protected]"
]
]
[gateways.oobetet.logger]
level = "INFO"
syslog_errors = "yes"
syslog_errors = true
6 changes: 3 additions & 3 deletions features/cli.feature
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ log_dir = "tmp/cucumber_cli/"
[redis]
db = 14
[processor]
enabled = "yes"
enabled = true
[processor.logger]
level = "warn"
"""
Expand All @@ -23,7 +23,7 @@ log_dir = "tmp/cucumber_cli/"
[redis]
db = 14
[processor]
enabled = "yes"
enabled = true
[processor.logger]
level = "warn"
"""
Expand Down Expand Up @@ -79,7 +79,7 @@ test:
redis:
db: 14
processor:
enabled: no
enabled: false
"""
When I send a SIGHUP to the flapjack process
# TODO how to test for config file change?
Expand Down
2 changes: 1 addition & 1 deletion features/cli_flapper.feature
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ log_dir = "tmp/cucumber_cli/"
[redis]
db = 14
[processor]
enabled = "yes"
enabled = true
[processor.logger]
level = "warn"
"""
Expand Down
Loading

0 comments on commit e53daa8

Please sign in to comment.