Skip to content
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

Yann/cassandra metric mapping update #79

Merged
merged 2 commits into from
Nov 3, 2015

Conversation

yannmh
Copy link
Member

@yannmh yannmh commented Oct 20, 2015

Rebase of #50

Added changes
Create a cassandra_aliasing flag to select the appropriate aliasing logic.

  • cassandra_aliasing → compliant with CASSANDRA-4009
  • default behavior

@yannmh yannmh self-assigned this Oct 20, 2015
@yannmh yannmh force-pushed the yann/cassandra-metric-mapping-update branch from bded66d to 08b09ac Compare October 28, 2015 22:59
@yannmh yannmh removed their assignment Oct 28, 2015
@yannmh
Copy link
Member Author

yannmh commented Oct 28, 2015

@remh can you take a quick pass on the last commit please ?

@@ -60,8 +60,6 @@ public void sendMetrics(LinkedList<HashMap<String, Object>> metrics, String inst
// We need to edit metrics for legacy reasons (rename metrics, etc)
HashMap<String, Object> metric = new HashMap<String, Object>(m);

postProcess(metric);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also remove this method's definition, along with postProcessCassandra that is not used anymore.

@yannmh yannmh force-pushed the yann/cassandra-metric-mapping-update branch from 08b09ac to fc558c6 Compare November 2, 2015 23:55
This change does several things:
* Maintains parity for the deprecated Cassandra namespaces
* Remaps metric names to cassandra.$metric or cassandra.$metric.$attribute
* Drops name:$name tag because of redundancy
* Renames scope:$scope to $type:$scope so users can continue to use
  'columnfamily:mytable`, for instance

[[email protected]] Rebased on JMXFetch v0.8.0
@yannmh yannmh force-pushed the yann/cassandra-metric-mapping-update branch from fc558c6 to 1eca3c5 Compare November 2, 2015 23:57
@yannmh
Copy link
Member Author

yannmh commented Nov 2, 2015

Thanks @olivielpeau.
I addressed your comments and squashed the commits. Should be ready to merge.

@yannmh
Copy link
Member Author

yannmh commented Nov 3, 2015

Any thought on the cassandra_aliasing parameter name, before this get merged ? I am not entirely satisfied by the name, but I can't find a better one. cc @remh @olivielpeau

Create a `cassandra_aliasing` flag to select the appropriate aliasing
logic.
* `cassandra_aliasing` → compliant with CASSANDRA-4009
* default behavior
@yannmh yannmh force-pushed the yann/cassandra-metric-mapping-update branch from 1eca3c5 to 941f6ec Compare November 3, 2015 00:19
@olivielpeau
Copy link
Member

Looks good to me!

Don't have any better idea for the parameter name 😕

yannmh added a commit that referenced this pull request Nov 3, 2015
@yannmh yannmh merged commit 0bc1a29 into master Nov 3, 2015
@yannmh yannmh deleted the yann/cassandra-metric-mapping-update branch November 3, 2015 14:46
yannmh added a commit to DataDog/dd-agent that referenced this pull request Nov 3, 2015
**Changes**
* [BUGFIX] Fix bean name matching logic: `OR`→`AND`. See [#81][]
* [FEATURE] Support `float` and `java.lang.Float` attribute types as
* simple JMX attributes. See [#76][]
* [FEATURE] Support Cassandra > 2.2 metric name structure
* (CASSANDRA-4009). See [#79][]
* [FEATURE] Support custom JMX Service URL to connect to, on a
* per-instance basis. See [#80][]
* [IMPROVEMENT] Assign generic alias if not defined. See [#78][]

<!--- The following link definition list is generated by PimpMyChangelog
--->
[#76]: DataDog/jmxfetch#76
[#78]: DataDog/jmxfetch#78
[#79]: DataDog/jmxfetch#79
[#80]: DataDog/jmxfetch#80
[#81]: DataDog/jmxfetch#81
urosgruber pushed a commit to urosgruber/dd-agent that referenced this pull request Dec 23, 2015
**Changes**
* [BUGFIX] Fix bean name matching logic: `OR`→`AND`. See [DataDog#81][]
* [FEATURE] Support `float` and `java.lang.Float` attribute types as
* simple JMX attributes. See [DataDog#76][]
* [FEATURE] Support Cassandra > 2.2 metric name structure
* (CASSANDRA-4009). See [DataDog#79][]
* [FEATURE] Support custom JMX Service URL to connect to, on a
* per-instance basis. See [DataDog#80][]
* [IMPROVEMENT] Assign generic alias if not defined. See [DataDog#78][]

<!--- The following link definition list is generated by PimpMyChangelog
--->
[DataDog#76]: DataDog/jmxfetch#76
[DataDog#78]: DataDog/jmxfetch#78
[DataDog#79]: DataDog/jmxfetch#79
[DataDog#80]: DataDog/jmxfetch#80
[DataDog#81]: DataDog/jmxfetch#81
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants