New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[cassandra] YAML configuration template versioning #263
Conversation
@yannmh You can likely run |
a87138e
to
d72f0fd
Compare
Thanks @miketheman. I fixed the offenses 🎨. and updated the PR. |
d72f0fd
to
fde0cbd
Compare
is_version_greater_22
to select YAMLuse_new_metrics
to select YAML
fde0cbd
to
ad8255a
Compare
use_new_metrics
to select YAML
Brought the last changes discussed @remh. I'll merge it after i get your 👍 |
LGTM, what's the best way to document this ? |
@remh I think the current way to do it is by adding relevant comments in the recipe itself 😏 , c.f. https://github.com/DataDog/chef-datadog/blob/master/recipes/cassandra.rb#L3-L26. |
786f308
to
3b3da0f
Compare
Added some documentation. |
3b3da0f
to
c5ccd50
Compare
c5ccd50
to
36a7d50
Compare
36a7d50
to
bdd58e1
Compare
LGTM but @miketheman should give the final 👍 |
Thanks! We're planning a merge-a-thon next week. |
Getting back to this now. @yannmh There seems to be a slight mismatch between the current dd-agent example and the erb template here. Here's a diff: Expected equivalent JSON
Diff:
@@ -46,18 +46,13 @@
{
"exclude": {
"keyspace": [
- "OpsCenter",
"system",
"system_auth",
"system_distributed",
- "system_schema",
"system_traces"
]
},
"include": {
- "bean_regex": [
- ".*keyspace=.*"
- ],
"domain": "org.apache.cassandra.metrics",
"name": [
"TotalDiskSpaceUsed",
Items 1 and 2 were released with Agent 5.7.0, Item 3 is pending Agent 5.7.4 release. |
Pinging @yannmh & @sethrosenblum for follow-up questions in last comment. |
It looks to me like all these things should be carried over to this PR. @johnaxel can you confirm that? question 3 looks like it should only apply to version 2. |
Agreed on all counts @sethrosenblum. |
@sethrosenblum Thanks! I believe this branch needs a rebase against |
* Enhance `DatadogMonitor` resource with a `version` attribute. * Use `version` attribute in `cassandra` recipe to version, i.e. select the appriopriate YAML configuration file. Two versions are currently available * `1` (Default): Legacy YAML configuration file, compatible with Cassandra < 2.2. * `2`: Required for Cassandra > 2.2, use the YAML configuration file * introduced with DataDog/dd-agent@2df7566 * Enable `cassandra_aliasing` option to comply with DataDog/dd-agent#2035 More information: DataDog/dd-agent#2142
* Exclude metrics from Datastax Opscenter * Exclude metrics from system_schema as per DataDog/dd-agent#2339 * Exclude keyspace metrics ColumnFamily metrics not associated with a keyspace as per DataDog/dd-agent#2271
6a7c5f9
to
307aaee
Compare
Covers both version 1 (default) and version 2 template configurations.
Thanks @sethrosenblum and @yannmh ! I've added a spec test to cover these templates, and may remove the kitchen tests in the next minor version. |
[cassandra] YAML configuration template versioning
DatadogMonitor
resource with aversion
attribute.version
attribute incassandra
recipe to version, i.e.select the appriopriate YAML configuration file.
Two versions are currently available
1
(Default): Legacy YAML configuration file, compatible withCassandra < 2.2.
2
: Required for Cassandra > 2.2, use the YAML configuration file introduced withDataDog/dd-agent@2df7566
cassandra_aliasing
option to comply with[jmxfetch][cassandra] 0.9.0 + enable CASSANDRA-4009 support dd-agent#2035
More information:
DataDog/dd-agent#2142
This is quite an important change, would you mind taking a pass on it @remh, @miketheman please ?
Thanks