[acassen/keepalived] 1b6597: Merge pull request #736 from pqarmitage/fixes
pqarmitage <[email protected]> Mon, 08 Jan 2018 07:53:52 -0800
| Newsgroups | gmane.linux.keepalived.devel |
|---|---|
| Message-ID | <5a539410dbfec_23392ade4aaf5c14490bf@hookshot-fe-88eb02d.cp1-iad.github.net.mail> |
Branch: refs/heads/beta
Home: https://github.com/acassen/keepalived
Commit: 1b6597f724539d937e536861cbf2d10fbc0cfd05
https://github.com/acassen/keepalived/commit/1b6597f724539d937e536861cbf2d10fbc0cfd05
Author: pqarmitage <[email protected]>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M keepalived/check/ipwrapper.c
M keepalived/core/main.c
M lib/Makefile.am
M lib/Makefile.in
A lib/assert.c
Log Message:
-----------
Merge pull request #736 from pqarmitage/fixes
Enable sorry server at startup if needed, and minor improvements
Commit: da40b044a4d861cf2f3174cd5e49ad5448ddb89a
https://github.com/acassen/keepalived/commit/da40b044a4d861cf2f3174cd5e49ad5448ddb89a
Author: pqarmitage <[email protected]>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M keepalived/check/check_data.c
Log Message:
-----------
Merge pull request #738 from pqarmitage/fixes
For virtual servers, ensure quorum <= number of real servers
Commit: 5f7a2dc127c309de8e57a1cb866f0f8354b0ef92
https://github.com/acassen/keepalived/commit/5f7a2dc127c309de8e57a1cb866f0f8354b0ef92
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/core/main.c
Log Message:
-----------
Further fix commit eacec9f7 - Improve and fix use of getopt_long()
It transpires that if a short option is specified, longindex isn't
updated at all, so we need to set it to a known invalid value before
each call of getopt_long, so we can detect if a long option has been
specified or not.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: eda0e283f95116da7ed5b9406fff1ee3784b71c9
https://github.com/acassen/keepalived/commit/eda0e283f95116da7ed5b9406fff1ee3784b71c9
Author: pqarmitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/core/main.c
Log Message:
-----------
Merge pull request #740 from pqarmitage/fixes
Further fix commit eacec9f7 - Improve and fix use of getopt_long()
Commit: 77f6ad222f7802097157325e547a6c3b7ec9c8ac
https://github.com/acassen/keepalived/commit/77f6ad222f7802097157325e547a6c3b7ec9c8ac
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/core/main.c
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: 0975b2a3d0f100395a6d494585bc2869740fa06c
https://github.com/acassen/keepalived/commit/0975b2a3d0f100395a6d494585bc2869740fa06c
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/check/check_snmp.c
Log Message:
-----------
Fix some SNMP keepalived checker integer types and default values
Some virtual server and real server values were being sent to SNMP
with a signed type whereas the value is unsigned, so set the type
field correctly.
Some virtual server and real server values that apply to checkers
are set to nonsense default values in order to determine if a
value has been specified. Handle these values when reporting them
to SNMP replying with 0 rather than a nonsense value.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 98c721d45593b46ee2aa1249ad7151d2f59ae2e9
https://github.com/acassen/keepalived/commit/98c721d45593b46ee2aa1249ad7151d2f59ae2e9
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/check/check_snmp.c
Log Message:
-----------
Revert "Fix some SNMP keepalived checker integer types and default values"
This reverts commit 0975b2a3d0f100395a6d494585bc2869740fa06c.
Commit: 55ba508497c648e4e760ec45e11689e5b6e0d910
https://github.com/acassen/keepalived/commit/55ba508497c648e4e760ec45e11689e5b6e0d910
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/check/check_snmp.c
Log Message:
-----------
Fix some SNMP keepalived checker integer types and default values
Some virtual server and real server values were being sent to SNMP
with a signed type whereas the value is unsigned, so set the type
field correctly.
Some virtual server and real server values that apply to checkers
are set to nonsense default values in order to determine if a
value has been specified. Handle these values when reporting them
to SNMP replying with 0 rather than a nonsense value.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 2c57ca0c304bf2c30e92c7f141266d76c3540510
https://github.com/acassen/keepalived/commit/2c57ca0c304bf2c30e92c7f141266d76c3540510
Author: Quentin Armitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/check/check_snmp.c
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: 7bd9c1cdff7fee2dfe7f8273c900d03ece6c5c23
https://github.com/acassen/keepalived/commit/7bd9c1cdff7fee2dfe7f8273c900d03ece6c5c23
Author: pqarmitage <[email protected]>
Date: 2018-01-06 (Sat, 06 Jan 2018)
Changed paths:
M keepalived/check/check_snmp.c
Log Message:
-----------
Merge pull request #741 from pqarmitage/fixes
Fix some SNMP keepalived checker integer types and default values
Commit: 21c0634449d7d11d2228519e331f164171c3a3d8
https://github.com/acassen/keepalived/commit/21c0634449d7d11d2228519e331f164171c3a3d8
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M lib/notify.h
Log Message:
-----------
Fix some MALLOC/FREE issues with notify FIFOs
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 91d05eb1c45d16cfa22c6025c04cbdecd1aef349
https://github.com/acassen/keepalived/commit/91d05eb1c45d16cfa22c6025c04cbdecd1aef349
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M lib/notify.h
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: 1217caf469df813e52855a78dc627d407c58ffee
https://github.com/acassen/keepalived/commit/1217caf469df813e52855a78dc627d407c58ffee
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M lib/notify.c
Log Message:
-----------
Fix storing of parameters for notify scripts
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 6ae86629921d0a9bc48c8d66cbf148535657f625
https://github.com/acassen/keepalived/commit/6ae86629921d0a9bc48c8d66cbf148535657f625
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M lib/notify.c
M lib/scheduler.c
Log Message:
-----------
Allow a child thread not to timeout (needed for fifo scripts)
Signed-off-by: Quentin Armitage <[email protected]>
Commit: c6f0980ad1c4e03d3d5666ecec2bc4ec93e2a669
https://github.com/acassen/keepalived/commit/c6f0980ad1c4e03d3d5666ecec2bc4ec93e2a669
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/smtp.c
Log Message:
-----------
Add instance_name/config_id to alert emails' subjects if configured
If multiple instances of keepalived are running, either different
instance_names and/or config_ids, it is useful to know which
keepalived instance the email relates to.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: f248406a87b34530791a7ab029191cf25e18cc0f
https://github.com/acassen/keepalived/commit/f248406a87b34530791a7ab029191cf25e18cc0f
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/smtp.c
Log Message:
-----------
Ensure that email body string isn't unterminated
Using strncpy() needs to ensure that there is a nul termination byte,
so this commits adds always writing a nul byte to the end of the buffer.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: f5ac56838dd3cd3124b8f18278680fce4a263c3d
https://github.com/acassen/keepalived/commit/f5ac56838dd3cd3124b8f18278680fce4a263c3d
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/smtp.c
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: d13ee62e9dc065896c7ecda93ea84b946a576a3e
https://github.com/acassen/keepalived/commit/d13ee62e9dc065896c7ecda93ea84b946a576a3e
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/core/smtp.c
Log Message:
-----------
Fix for previous merge
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 725d3594f39e8f4a6f81d84bffb5257bfd1d7ff6
https://github.com/acassen/keepalived/commit/725d3594f39e8f4a6f81d84bffb5257bfd1d7ff6
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/check/check_bfd.c
M keepalived/check/check_misc.c
Log Message:
-----------
Remove extraneuos space in e couple of email subject lines
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 5ab53fb54360e8b0d0076dc8ccfefdb385982546
https://github.com/acassen/keepalived/commit/5ab53fb54360e8b0d0076dc8ccfefdb385982546
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/check/check_bfd.c
M keepalived/check/check_dns.c
M keepalived/check/check_http.c
M keepalived/check/check_misc.c
M keepalived/check/check_smtp.c
M keepalived/check/check_tcp.c
M keepalived/core/smtp.c
M keepalived/include/smtp.h
M keepalived/vrrp/vrrp_notify.c
Log Message:
-----------
Simplify how smtp_alert() is called
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 67f5498529016f3926fdb35360ea5008a04fed1f
https://github.com/acassen/keepalived/commit/67f5498529016f3926fdb35360ea5008a04fed1f
Author: Quentin Armitage <[email protected]>
Date: 2018-01-07 (Sun, 07 Jan 2018)
Changed paths:
M keepalived/check/ipwrapper.c
M keepalived/core/smtp.c
Log Message:
-----------
Add smtp alerts for virtual server quorum gained/lost
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 64d0fe8ef537f771d1b0fc3f87f762abe7134f9b
https://github.com/acassen/keepalived/commit/64d0fe8ef537f771d1b0fc3f87f762abe7134f9b
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M doc/KEEPALIVED-MIB.txt
M doc/keepalived.conf.SYNOPSIS
M doc/man/man5/keepalived.conf.5
M keepalived/check/check_bfd.c
M keepalived/check/check_data.c
M keepalived/check/check_dns.c
M keepalived/check/check_http.c
M keepalived/check/check_misc.c
M keepalived/check/check_parser.c
M keepalived/check/check_smtp.c
M keepalived/check/check_snmp.c
M keepalived/check/check_tcp.c
M keepalived/check/ipwrapper.c
M keepalived/core/smtp.c
M keepalived/include/check_data.h
M keepalived/vrrp/vrrp_parser.c
Log Message:
-----------
Add smtp_alert config option for real and virtual servers
Unfortunately, smtp alerts were always sent for real servers, but
for vrrp instances and groups were only sent if smtp_alert was
configured, and they were never sent for virtual servers.
Following this commit, vrrp instances, vrrp groups, real servers
and virtual servers support the smtp_alert keyword, but in order
to maintain backward compatibility the default for real servers
is enabled, and for all the others disabled.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: 7ddce70df642e16174f4586ead7a47a2388cd91b
https://github.com/acassen/keepalived/commit/7ddce70df642e16174f4586ead7a47a2388cd91b
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M keepalived/core/smtp.c
Log Message:
-----------
Remove debugging messages left in previous commit
Signed-off-by: Quentin Armitage <[email protected]>
Commit: dd19aafed0a721c315001c6bc77d3e6dc55365e2
https://github.com/acassen/keepalived/commit/dd19aafed0a721c315001c6bc77d3e6dc55365e2
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M doc/KEEPALIVED-MIB.txt
M doc/keepalived.conf.SYNOPSIS
M doc/man/man5/keepalived.conf.5
M keepalived/check/check_data.c
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/core/snmp.c
M keepalived/include/check_data.h
M keepalived/include/global_data.h
M keepalived/include/vrrp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
Log Message:
-----------
Add global smtp_alert, smtp_alert_vrrp & smtp_alert_checker keywords
Rather than having to configure smtp_alert against each vrrp sync group,
vrrp instance, real server and virtual server, this allows defaults to
be set at a global level, which probably reflects how users will want
to use this.
Signed-off-by: Quentin Armitage <[email protected]>
Commit: a6c6a38d86dd3ecfe5877adab1b023ee40dcc434
https://github.com/acassen/keepalived/commit/a6c6a38d86dd3ecfe5877adab1b023ee40dcc434
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Log Message:
-----------
Merge branch 'master' into fixes
Commit: 64bdc2330411d6ea144d4be9fbff144e81b34ba7
https://github.com/acassen/keepalived/commit/64bdc2330411d6ea144d4be9fbff144e81b34ba7
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Log Message:
-----------
Merge branch 'fixes' into beta
Commit: d339fd61eb785d74e407781399fe340baf29d46a
https://github.com/acassen/keepalived/commit/d339fd61eb785d74e407781399fe340baf29d46a
Author: Quentin Armitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Log Message:
-----------
Merge remote-tracking branch 'upstream/beta' into beta
Commit: c1fd3b74cfc5607b74488a08263bd5969b3d4d8f
https://github.com/acassen/keepalived/commit/c1fd3b74cfc5607b74488a08263bd5969b3d4d8f
Author: pqarmitage <[email protected]>
Date: 2018-01-08 (Mon, 08 Jan 2018)
Changed paths:
M doc/KEEPALIVED-MIB.txt
M doc/keepalived.conf.SYNOPSIS
M doc/man/man5/keepalived.conf.5
M keepalived/check/check_bfd.c
M keepalived/check/check_data.c
M keepalived/check/check_dns.c
M keepalived/check/check_http.c
M keepalived/check/check_misc.c
M keepalived/check/check_parser.c
M keepalived/check/check_smtp.c
M keepalived/check/check_snmp.c
M keepalived/check/check_tcp.c
M keepalived/check/ipwrapper.c
M keepalived/core/global_data.c
M keepalived/core/global_parser.c
M keepalived/core/main.c
M keepalived/core/smtp.c
M keepalived/core/snmp.c
M keepalived/include/check_data.h
M keepalived/include/global_data.h
M keepalived/include/smtp.h
M keepalived/include/vrrp.h
M keepalived/vrrp/vrrp.c
M keepalived/vrrp/vrrp_data.c
M keepalived/vrrp/vrrp_notify.c
M keepalived/vrrp/vrrp_parser.c
M lib/notify.c
M lib/notify.h
M lib/scheduler.c
Log Message:
-----------
Merge pull request #744 from pqarmitage/beta
Add smtp alerts for quorum gained/lost, streamline smtp_alert handling and minor fixes
Compare: https://github.com/acassen/keepalived/compare/55b4b25bc8f6...c1fd3b74cfc5
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel