From d12d60da15882f9a485e36df1361239cac37bf16 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Thu, 17 Sep 2015 00:12:00 +0200
Subject: [PATCH] Deprecate event trait plugin 'split'

'split' plugin can be replaced by an jsonpath expresion
since jsonpath-rw-ext>=0.1.8.

This change deprecates it

Depends-On: I8cd971d6dd98cd6c4c3dc83696969c47e8cdd8ac
Change-Id: Iac2253c81dacaa1b2a2258569716d20916fc9920
---
 ceilometer/event/trait_plugins.py     | 13 +++++++++++++
 etc/ceilometer/event_definitions.yaml | 10 ++--------
 requirements.txt                      |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py
index 912788fe..b8e0df10 100644
--- a/ceilometer/event/trait_plugins.py
+++ b/ceilometer/event/trait_plugins.py
@@ -15,8 +15,13 @@
 
 import abc
 
+from oslo_log import log
 import six
 
+from ceilometer.i18n import _LW
+
+LOG = log.getLogger(__name__)
+
 
 @six.add_metaclass(abc.ABCMeta)
 class TraitPluginBase(object):
@@ -102,6 +107,14 @@ class SplitterTraitPlugin(TraitPluginBase):
         :param  segment:    Which segment to return. (int) default 0
         :param  max_split: Limit number of splits. Default: None (no limit)
         """
+        LOG.warning(_LW('split plugin is deprecated, '
+                        'add ".`split(%(sep)s, %(segment)d, '
+                        '%(max_split)d)`" to your jsonpath instead') %
+                    dict(sep=separator,
+                         segment=segment,
+                         max_split=(-1 if max_split is None
+                                    else max_split)))
+
         self.separator = separator
         self.segment = segment
         self.max_split = max_split
diff --git a/etc/ceilometer/event_definitions.yaml b/etc/ceilometer/event_definitions.yaml
index 3e60a494..f01c5304 100644
--- a/etc/ceilometer/event_definitions.yaml
+++ b/etc/ceilometer/event_definitions.yaml
@@ -8,15 +8,9 @@
     instance_id:
       fields: payload.instance_id
     host:
-      fields: publisher_id
-      plugin:
-        name: split
-        parameters:
-          segment: 1
-          max_split: 1
+      fields: publisher_id.`split(., 1, 1)`
     service:
-      fields: publisher_id
-      plugin: split
+      fields: publisher_id.`split(., 0, -1)`
     memory_mb:
       type: int
       fields: payload.memory_mb
diff --git a/requirements.txt b/requirements.txt
index b37db922..15904557 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 croniter>=0.3.4 # MIT License
 eventlet>=0.17.4
-jsonpath-rw-ext>=0.1.7
+jsonpath-rw-ext>=0.1.9
 jsonschema!=2.5.0,<3.0.0,>=2.0.0
 kafka-python>=0.9.2 # Apache-2.0
 keystonemiddleware>=2.0.0