[2016.3] Merge forward from 2015.8 to 2016.3 #35522
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
service checks. The function "agent_service_register" in the consul.py module failed to register service health checks and did not follow the consul.io documentation for doing so. This patch fixes the code to successfully register service checks, check for dict keys case-insensitive (because the absense of keys with the correct case would fail silently), and more closely follow the documentation at consul.io, see: https://www.consul.io/docs/agent/http/agent.html#agent_service_register Here is an example salt state for registering a service and a couple of health checks, similar to the example in the consul.io documents: example-service-registration: module.run: - name: consul.agent_service_register - consul_url: "http://localhost:8500" - kwargs: id: redis1 name: "redis" tags: [master, v1] address: "127.0.0.1" port: 8000 EnableTagOverride: false check: script: "/usr/local/bin/check_redis.py" http: "http://localhost:5000/health" interval: "15s" NOTE: the saltstack documentation needs to be updated. It wasn't correct anyway.
Add Carbon to versionadded for git.diff
Fixes spacing in requirements files
Add job cache test
Conflicts: - doc/conf.py - tests/runtests.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: