You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/11/13 20:47:39 UTC

svn commit: r1541676 - in /incubator/sirona/trunk: server/store/cassandra/src/main/java/org/apache/sirona/cassandra/ server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/ server/store/cassandra/src/main/java/org/apache/sirona/cass...

Author: rmannibucau
Date: Wed Nov 13 19:47:38 2013
New Revision: 1541676

URL: http://svn.apache.org/r1541676
Log:
back to normal column families, super column are deprecated and compiste doesn't help us that much

Modified:
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/CassandraBuilder.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/CassandraSirona.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
    incubator/sirona/trunk/server/store/cassandra/src/test/resources/sirona.properties
    incubator/sirona/trunk/src/site/markdown/cassandra.md

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/CassandraBuilder.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/CassandraBuilder.java?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/CassandraBuilder.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/CassandraBuilder.java Wed Nov 13 19:47:38 2013
@@ -16,21 +16,25 @@
  */
 package org.apache.sirona.cassandra;
 
+import me.prettyprint.cassandra.service.CassandraHost;
 import me.prettyprint.hector.api.HConsistencyLevel;
 import org.apache.sirona.configuration.ioc.AutoSet;
 
 @AutoSet
 public class CassandraBuilder {
-    private String hosts = "localhost:9171";
+    private String hosts = "localhost:" + CassandraHost.DEFAULT_PORT;
     private String cluster = "sirona-cluster";
     private String keyspace = "sirona";
-    private String counterColumnFamily = "counters";
+    private String counterColumnFamily = "counters_values";
     private String gaugeValuesColumnFamily = "gauges_values";
-    private String statusColumnFamily = "statuses";
+    private String statusColumnFamily = "statuses_values";
+    private String markerCountersColumnFamily = "markers_counters";
+    private String markerStatusesColumnFamily = "markers_statuses";
     private String markerGaugesColumFamily = "markers_gauges";
     private String writeConsistencyLevel = HConsistencyLevel.QUORUM.name();
     private String readConsistencyLevel = HConsistencyLevel.QUORUM.name();
     private int replicationFactor = 1;
+    private int maxActive = CassandraHost.DEFAULT_MAX_ACTIVE;
 
     public String getHosts() {
         return hosts;
@@ -64,6 +68,14 @@ public class CassandraBuilder {
         return markerGaugesColumFamily;
     }
 
+    public String getMarkerCountersColumnFamily() {
+        return markerCountersColumnFamily;
+    }
+
+    public String getMarkerStatusesColumnFamily() {
+        return markerStatusesColumnFamily;
+    }
+
     public HConsistencyLevel getWriteConsistencyLevel() {
         return HConsistencyLevel.valueOf(writeConsistencyLevel);
     }
@@ -71,4 +83,12 @@ public class CassandraBuilder {
     public HConsistencyLevel getReadConsistencyLevel() {
         return HConsistencyLevel.valueOf(readConsistencyLevel);
     }
+
+    public int getMaxActive() {
+        return maxActive;
+    }
+
+    public void setMaxActive(int maxActive) {
+        this.maxActive = maxActive;
+    }
 }

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/CassandraSirona.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/CassandraSirona.java?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/CassandraSirona.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/CassandraSirona.java Wed Nov 13 19:47:38 2013
@@ -20,17 +20,15 @@ import me.prettyprint.cassandra.model.Co
 import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
 import me.prettyprint.cassandra.serializers.StringSerializer;
 import me.prettyprint.cassandra.service.CassandraHostConfigurator;
+import me.prettyprint.cassandra.service.StringKeyIterator;
 import me.prettyprint.cassandra.service.ThriftKsDef;
 import me.prettyprint.hector.api.Cluster;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.HColumn;
 import me.prettyprint.hector.api.beans.OrderedRows;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
 import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.SuperRow;
 import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
-import me.prettyprint.hector.api.ddl.ColumnType;
 import me.prettyprint.hector.api.ddl.ComparatorType;
 import me.prettyprint.hector.api.factory.HFactory;
 import org.apache.sirona.cassandra.CassandraBuilder;
@@ -39,7 +37,6 @@ import org.apache.sirona.configuration.i
 import org.apache.sirona.configuration.ioc.IoCs;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.logging.Logger;
 
@@ -57,7 +54,7 @@ public class CassandraSirona {
 
     public CassandraSirona() {
         final CassandraHostConfigurator configurator = new CassandraHostConfigurator(builder.getHosts());
-        configurator.setMaxActive(75);
+        configurator.setMaxActive(builder.getMaxActive());
         cluster = HFactory.getOrCreateCluster(builder.getCluster(), configurator);
 
         final String keyspaceName = builder.getKeyspace();
@@ -69,15 +66,17 @@ public class CassandraSirona {
 
         final ColumnFamilyDefinition gauges = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getGaugeValuesColumnFamily(), ComparatorType.LONGTYPE);
         final ColumnFamilyDefinition markersGauges = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getMarkerGaugesColumFamily(), ComparatorType.UTF8TYPE);
-        final ColumnFamilyDefinition counters = createSuperColumn(keyspaceName, builder.getCounterColumnFamily(), ComparatorType.UTF8TYPE);
-        final ColumnFamilyDefinition statuses = createSuperColumn(keyspaceName, builder.getStatusColumnFamily(), ComparatorType.UTF8TYPE);
+        final ColumnFamilyDefinition counters = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getCounterColumnFamily(), ComparatorType.UTF8TYPE);
+        final ColumnFamilyDefinition markersCounters = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getMarkerCountersColumnFamily(), ComparatorType.UTF8TYPE);
+        final ColumnFamilyDefinition statuses = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getStatusColumnFamily(), ComparatorType.UTF8TYPE);
+        final ColumnFamilyDefinition markersStatuses = HFactory.createColumnFamilyDefinition(keyspaceName, builder.getMarkerStatusesColumnFamily(), ComparatorType.UTF8TYPE);
 
         { // ensure keyspace exists, here if the keyspace doesn't exist we suppose nothing exist
             if (cluster.describeKeyspace(keyspaceName) == null) {
                 LOGGER.info("Creating Sirona Cassandra '" + keyspaceName + "' keyspace.");
                 cluster.addKeyspace(
                     HFactory.createKeyspaceDefinition(keyspaceName, ThriftKsDef.DEF_STRATEGY_CLASS, builder.getReplicationFactor(),
-                        asList(counters, gauges, markersGauges, statuses)));
+                        asList(counters, markersCounters, gauges, markersGauges, statuses, markersStatuses)));
             }
         }
     }
@@ -124,6 +123,14 @@ public class CassandraSirona {
         return builder.getMarkerGaugesColumFamily();
     }
 
+    public String getMarkerCountersColumnFamily() {
+        return builder.getMarkerCountersColumnFamily();
+    }
+
+    public String getMarkerStatusesColumnFamily() {
+        return builder.getMarkerStatusesColumnFamily();
+    }
+
     public String keySeparator() {
         return SEPARATOR;
     }
@@ -137,43 +144,10 @@ public class CassandraSirona {
     }
 
     public static Collection<String> keys(final Keyspace keyspace, final String family) {
-        final OrderedRows<String, String, Object> result = HFactory.createRangeSlicesQuery(keyspace, StringSerializer.get(), StringSerializer.get(), new DynamicDelegatedSerializer<Object>())
-            .setColumnFamily(family)
-            .setReturnKeysOnly()
-            .execute()
-            .get();
-
-        final Collection<String> set = new HashSet<String>();
-        if (result != null) {
-            for (final Row<String, String, ?> row :result) {
-                set.add(row.getKey());
-            }
-        }
-        return set;
-    }
-
-    public static Collection<String> superKeys(final Keyspace keyspace, final String family) {
-        final OrderedSuperRows<String, String, String, ?> result = HFactory.createRangeSuperSlicesQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get(), new DynamicDelegatedSerializer<Object>())
-            .setColumnFamily(family)
-            .setRange(null, null, false, Integer.MAX_VALUE)
-            .setKeys("", "")
-            .execute()
-            .get();
-
         final Collection<String> set = new HashSet<String>();
-        if (result != null) {
-            for (final SuperRow<String, String, String, ?> row : result) {
-                set.add(row.getKey());
-            }
+        for (final String item : new StringKeyIterator.Builder(keyspace, family).build()) {
+            set.add(item);
         }
-
         return set;
     }
-
-    private static ColumnFamilyDefinition createSuperColumn(final String keyspaceName, final String name, final ComparatorType comparator) {
-        final ColumnFamilyDefinition statuses = HFactory.createColumnFamilyDefinition(keyspaceName, name, ComparatorType.UTF8TYPE);
-        statuses.setColumnType(ColumnType.SUPER);
-        statuses.setSubComparatorType(comparator);
-        return statuses;
-    }
 }

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/counter/CassandraCollectorCounterDataStore.java Wed Nov 13 19:47:38 2013
@@ -22,10 +22,9 @@ import me.prettyprint.cassandra.serializ
 import me.prettyprint.cassandra.serializers.StringSerializer;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
+import me.prettyprint.hector.api.beans.ColumnSlice;
 import me.prettyprint.hector.api.beans.HColumn;
 import me.prettyprint.hector.api.beans.HSuperColumn;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
-import me.prettyprint.hector.api.beans.SuperRow;
 import me.prettyprint.hector.api.factory.HFactory;
 import me.prettyprint.hector.api.query.QueryResult;
 import org.apache.sirona.Role;
@@ -39,25 +38,25 @@ import org.apache.sirona.store.counter.A
 import org.apache.sirona.store.counter.InMemoryCollectorCounterStore;
 import org.apache.sirona.store.counter.LeafCollectorCounter;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
 import static org.apache.sirona.cassandra.collector.CassandraSirona.column;
-import static org.apache.sirona.cassandra.collector.CassandraSirona.superKeys;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.emptyColumn;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.keys;
 
 public class CassandraCollectorCounterDataStore extends InMemoryCollectorCounterStore {
     private final Keyspace keyspace;
     private final String family;
+    private final String markerFamily;
     private final CassandraSirona cassandra;
 
     public CassandraCollectorCounterDataStore() {
         this.cassandra = IoCs.findOrCreateInstance(CassandraSirona.class);
         this.keyspace = cassandra.getKeyspace();
+        this.markerFamily = cassandra.getMarkerCountersColumnFamily();
         this.family = cassandra.getCounterColumnFamily();
     }
 
@@ -72,32 +71,29 @@ public class CassandraCollectorCounterDa
 
     @Override
     public Collection<? extends LeafCollectorCounter> getCounters(final String marker) {
-        final DynamicDelegatedSerializer<Object> dynamicSerializer = new DynamicDelegatedSerializer<Object>();
-        final QueryResult<OrderedSuperRows<String, String, String, Object>> mainResult =
-            HFactory.createRangeSuperSlicesQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get(), dynamicSerializer)
-                .setColumnFamily(family)
-                .setRange(null, null, false, Integer.MAX_VALUE)
-                .setKeys(marker, marker)
-                .execute();
+        final QueryResult<ColumnSlice<String, String>> qResult = HFactory.createSliceQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
+            .setKey(marker)
+            .setColumnFamily(markerFamily)
+            .setRange(null, null, false, Integer.MAX_VALUE)
+            .execute();
 
-        if (mainResult == null) {
-            return Collections.<LeafCollectorCounter>emptyList();
+        final Collection<CassandraLeafCounter> counters = new LinkedList<CassandraLeafCounter>();
+        if (qResult == null || qResult.get() == null) {
+            return counters;
         }
 
-        final Collection<CassandraLeafCounter> counters = new LinkedList<CassandraLeafCounter>();
-        for (final SuperRow<String, String, String, Object> c : mainResult.get()) {
-            for (final HSuperColumn<String, String, Object> col : c.getSuperSlice().getSuperColumns()) {
-                final String[] segments = col.getName().split(cassandra.keySeparator());
-                final Counter.Key ckey = new Counter.Key(new Role(segments[0], Unit.get(segments[1])), segments[2]);
-                counters.add(counter(ckey, dynamicSerializer, col, marker));
-            }
+        for (final HColumn<String, String> colum : qResult.get().getColumns()) {
+            final String[] segments = colum.getName().split(cassandra.keySeparator());
+            final Counter.Key ckey = new Counter.Key(new Role(segments[0], Unit.get(segments[1])), segments[2]);
+            counters.add(findByKey(ckey, marker));
         }
+
         return counters;
     }
 
     @Override
     public Collection<String> markers() {
-        return superKeys(keyspace, family);
+        return keys(keyspace, markerFamily);
     }
 
     @Override // TODO: see if we shouldn't store it or if aggregation can be done on java side
@@ -143,60 +139,57 @@ public class CassandraCollectorCounterDa
     }
 
     protected CassandraLeafCounter findByKey(final Counter.Key ckey, final String marker) {
-        final String key = id(ckey, marker);
-
         final DynamicDelegatedSerializer<Object> serializer = new DynamicDelegatedSerializer<Object>();
 
-        final HSuperColumn<String, String, Object> result =
-            HFactory.createSuperColumnQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get(), serializer)
+        final QueryResult<ColumnSlice<String, Object>> result =
+            HFactory.createSliceQuery(keyspace, StringSerializer.get(), StringSerializer.get(), serializer)
                 .setColumnFamily(family)
-                .setKey(marker)
-                .setSuperName(key)
-                .execute()
-                .get();
+                .setRange(null, null, false, Integer.MAX_VALUE)
+                .setKey(id(ckey, marker))
+                .execute();
 
-        if (result == null) {
+        if (result == null || result.get() == null || result.get().getColumns().isEmpty()) {
             return null;
         }
 
-        return counter(ckey, serializer, result, marker);
+        return counter(ckey, serializer, result.get(), marker);
     }
 
     protected CassandraLeafCounter counter(final Counter.Key ckey,
                                            final DynamicDelegatedSerializer<Object> serializer,
-                                           final HSuperColumn<String, String, Object> map,
+                                           final ColumnSlice<String, Object> map,
                                            final String marker) {
         return new CassandraLeafCounter(ckey, this, marker)
             .sync(new M2AwareStatisticalSummary(
-                getOrDefault(serializer, map.getSubColumnByName("mean"), DoubleSerializer.get()).doubleValue(),
-                getOrDefault(serializer, map.getSubColumnByName("variance"), DoubleSerializer.get()).doubleValue(),
-                getOrDefault(serializer, map.getSubColumnByName("n"), LongSerializer.get()).longValue(),
-                getOrDefault(serializer, map.getSubColumnByName("max"), DoubleSerializer.get()).doubleValue(),
-                getOrDefault(serializer, map.getSubColumnByName("min"), DoubleSerializer.get()).doubleValue(),
-                getOrDefault(serializer, map.getSubColumnByName("sum"), DoubleSerializer.get()).doubleValue(),
-                getOrDefault(serializer, map.getSubColumnByName("m2"), DoubleSerializer.get()).doubleValue()),
-                getOrDefault(serializer, map.getSubColumnByName("maxConcurrency"), IntegerSerializer.get()).intValue());
+                getOrDefault(serializer, map.getColumnByName("mean"), DoubleSerializer.get()).doubleValue(),
+                getOrDefault(serializer, map.getColumnByName("variance"), DoubleSerializer.get()).doubleValue(),
+                getOrDefault(serializer, map.getColumnByName("n"), LongSerializer.get()).longValue(),
+                getOrDefault(serializer, map.getColumnByName("max"), DoubleSerializer.get()).doubleValue(),
+                getOrDefault(serializer, map.getColumnByName("min"), DoubleSerializer.get()).doubleValue(),
+                getOrDefault(serializer, map.getColumnByName("sum"), DoubleSerializer.get()).doubleValue(),
+                getOrDefault(serializer, map.getColumnByName("m2"), DoubleSerializer.get()).doubleValue()),
+                getOrDefault(serializer, map.getColumnByName("maxConcurrency"), IntegerSerializer.get()).intValue());
     }
 
     protected CassandraLeafCounter save(final CassandraLeafCounter counter, final String marker) {
         final Counter.Key key = counter.getKey();
         final String id = id(key, marker);
 
-        final List<HColumn<String, Object>> columns = new ArrayList<HColumn<String, Object>>();
-        columns.add(HColumn.class.cast(column("role", key.getRole().getName())));
-        columns.add(HColumn.class.cast(column("key", key.getName())));
-        columns.add(HColumn.class.cast(column("maxConcurrency", counter.getMaxConcurrency())));
-        columns.add(HColumn.class.cast(column("variance", counter.getVariance())));
-        columns.add(HColumn.class.cast(column("n", counter.getHits())));
-        columns.add(HColumn.class.cast(column("max", counter.getMax())));
-        columns.add(HColumn.class.cast(column("min", counter.getMin())));
-        columns.add(HColumn.class.cast(column("sum", counter.getSum())));
-        columns.add(HColumn.class.cast(column("m2", counter.getSecondMoment())));
-        columns.add(HColumn.class.cast(column("mean", counter.getMean())));
-
         HFactory.createMutator(keyspace, StringSerializer.get())
-            .addInsertion(marker, family,
-                HFactory.createSuperColumn(id, columns, StringSerializer.get(), StringSerializer.get(), new DynamicDelegatedSerializer<Object>()))
+            // counter values
+            .addInsertion(id, family, column("role", key.getRole().getName()))
+            .addInsertion(id, family, column("key", key.getName()))
+            .addInsertion(id, family, column("maxConcurrency", counter.getMaxConcurrency()))
+            .addInsertion(id, family, column("variance", counter.getVariance()))
+            .addInsertion(id, family, column("n", counter.getHits()))
+            .addInsertion(id, family, column("max", counter.getMax()))
+            .addInsertion(id, family, column("min", counter.getMin()))
+            .addInsertion(id, family, column("sum", counter.getSum()))
+            .addInsertion(id, family, column("m2", counter.getSecondMoment()))
+            .addInsertion(id, family, column("mean", counter.getMean()))
+            // counter in marker
+            .addInsertion(marker, markerFamily, emptyColumn(id))
+            //save it
             .execute();
 
         return counter;

Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/collector/status/CassandraCollectorNodeStatusDataStore.java Wed Nov 13 19:47:38 2013
@@ -18,11 +18,10 @@ package org.apache.sirona.cassandra.coll
 
 import me.prettyprint.cassandra.serializers.StringSerializer;
 import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.ColumnSlice;
 import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.HSuperColumn;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
-import me.prettyprint.hector.api.beans.SuperRow;
-import me.prettyprint.hector.api.beans.SuperSlice;
+import me.prettyprint.hector.api.beans.OrderedRows;
+import me.prettyprint.hector.api.beans.Row;
 import me.prettyprint.hector.api.factory.HFactory;
 import me.prettyprint.hector.api.mutation.Mutator;
 import me.prettyprint.hector.api.query.QueryResult;
@@ -33,45 +32,60 @@ import org.apache.sirona.status.Status;
 import org.apache.sirona.status.ValidationResult;
 import org.apache.sirona.store.status.CollectorNodeStatusDataStore;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
 import static org.apache.sirona.cassandra.collector.CassandraSirona.column;
+import static org.apache.sirona.cassandra.collector.CassandraSirona.emptyColumn;
 
 public class CassandraCollectorNodeStatusDataStore implements CollectorNodeStatusDataStore {
     private final Keyspace keyspace;
     private final String family;
+    private final String markerFamily;
+    private final CassandraSirona cassandra;
 
     public CassandraCollectorNodeStatusDataStore() {
-        final CassandraSirona cassandra = IoCs.findOrCreateInstance(CassandraSirona.class);
+        this.cassandra = IoCs.findOrCreateInstance(CassandraSirona.class);
         this.keyspace = cassandra.getKeyspace();
         this.family = cassandra.getStatusColumnFamily();
+        this.markerFamily = cassandra.getMarkerStatusesColumnFamily();
     }
 
     @Override
     public Map<String, NodeStatus> statuses() {
-        final QueryResult<OrderedSuperRows<String, String, String, String>> mainResult =
-            HFactory.createRangeSuperSlicesQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
-                .setColumnFamily(family)
+        final QueryResult<OrderedRows<String,String,String>> result =
+            HFactory.createRangeSlicesQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
+                .setColumnFamily(markerFamily)
                 .setRange(null, null, false, Integer.MAX_VALUE)
-                .setKeys("", "")
                 .execute();
 
-        if (mainResult == null) {
-            return Collections.emptyMap();
+        if (result == null || result.get() == null) {
+            return null;
         }
 
         final Map<String, NodeStatus> statuses = new HashMap<String, NodeStatus>();
-        for (final SuperRow<String, String, String, String> status : mainResult.get()) {
-            final SuperSlice<String,String,String> superSlice = status.getSuperSlice();
-
+        for (final Row<String, String, String> status : result.get()) {
             final Collection<ValidationResult> validations = new LinkedList<ValidationResult>();
-            for (final HSuperColumn<String, String, String> column : superSlice.getSuperColumns()) {
-                validations.add(new ValidationResult(column.getName(), Status.valueOf(column.getSubColumnByName("status").getValue()), column.getSubColumnByName("description").getValue()));
+
+            for (final HColumn<String, String> col : status.getColumnSlice().getColumns()) {
+                final QueryResult<ColumnSlice<String, String>> subResult =
+                    HFactory.createSliceQuery(keyspace, StringSerializer.get(), StringSerializer.get(), StringSerializer.get())
+                        .setColumnFamily(family)
+                        .setRange(null, null, false, Integer.MAX_VALUE)
+                        .setKey(col.getName())
+                        .execute();
+
+                if (subResult == null || subResult.get() == null) {
+                    continue;
+                }
+
+                final ColumnSlice<String, String> slice = subResult.get();
+                validations.add(new ValidationResult(
+                    slice.getColumnByName("name").getValue(),
+                    Status.valueOf(slice.getColumnByName("status").getValue()),
+                    slice.getColumnByName("description").getValue()));
             }
             statuses.put(status.getKey(), new NodeStatus(validations.toArray(new ValidationResult[validations.size()])));
         }
@@ -87,13 +101,11 @@ public class CassandraCollectorNodeStatu
     public void store(final String node, final NodeStatus status) {
         final Mutator<String> mutator = HFactory.createMutator(keyspace, StringSerializer.get());
         for (final ValidationResult validationResult : status.getResults()) {
-            mutator.addInsertion(node, family,
-                HFactory.createSuperColumn(validationResult.getName(),
-                    Arrays.<HColumn<String, String>>asList(
-                        column("description", validationResult.getMessage()),
-                        column("status", validationResult.getStatus().name())
-                    ),
-                    StringSerializer.get(), StringSerializer.get(), StringSerializer.get()));
+            final String id = cassandra.generateKey(node, validationResult.getName());
+            mutator.addInsertion(node, markerFamily, emptyColumn(id))
+                .addInsertion(id, family, column("name", validationResult.getName()))
+                .addInsertion(id, family, column("description", validationResult.getMessage()))
+                .addInsertion(id, family, column("status", validationResult.getStatus().name()));
         }
         mutator.execute();
     }

Modified: incubator/sirona/trunk/server/store/cassandra/src/test/resources/sirona.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/test/resources/sirona.properties?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/test/resources/sirona.properties (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/test/resources/sirona.properties Wed Nov 13 19:47:38 2013
@@ -15,3 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 org.apache.sirona.cassandra.CassandraBuilder.keyspace = TestCluster
+org.apache.sirona.cassandra.CassandraBuilder.hosts = localhost:9171

Modified: incubator/sirona/trunk/src/site/markdown/cassandra.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/cassandra.md?rev=1541676&r1=1541675&r2=1541676&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/cassandra.md (original)
+++ incubator/sirona/trunk/src/site/markdown/cassandra.md Wed Nov 13 19:47:38 2013
@@ -39,14 +39,17 @@ org.apache.sirona.store.DataStoreFactory
 Configuration is done through `org.apache.sirona.cassandra.CassandraBuilder`. here is the default configuration:
 
 <pre class="prettyprint linenums"><![CDATA[
-org.apache.sirona.cassandra.CassandraBuilder.hosts = localhost:9171
+org.apache.sirona.cassandra.CassandraBuilder.hosts = localhost:9160
 org.apache.sirona.cassandra.CassandraBuilder.cluster = sirona-cluster
 org.apache.sirona.cassandra.CassandraBuilder.keyspace = sirona
 org.apache.sirona.cassandra.CassandraBuilder.counterColumnFamily = counters
 org.apache.sirona.cassandra.CassandraBuilder.gaugeValuesColumnFamily = gauges_values
 org.apache.sirona.cassandra.CassandraBuilder.statusColumnFamily = statuses
 org.apache.sirona.cassandra.CassandraBuilder.markerGaugesColumFamily = markers_gauges
+org.apache.sirona.cassandra.CassandraBuilder.markerCountersColumFamily = markers_counters
+org.apache.sirona.cassandra.CassandraBuilder.markerStatusesColumFamily = markers_statuses
 org.apache.sirona.cassandra.CassandraBuilder.replicationFactor = 1
+org.apache.sirona.cassandra.CassandraBuilder.maxActive = 50
 org.apache.sirona.cassandra.CassandraBuilder.writeConsistencyLevel = QUORUM
 org.apache.sirona.cassandra.CassandraBuilder.readConsistencyLevel = QUORUM
 ]]></pre>
@@ -56,11 +59,17 @@ org.apache.sirona.cassandra.CassandraBui
 ## counters
 
 ```
-nodeId => (counterId1 => (role, key, maxConcurrency, variance, n, max, min, sum, m2, mean)), (counterId2 => (role, key, maxConcurrency, variance, n, max, min, sum, m2, mean))
+counterId1 => (role, key, maxConcurrency, variance, n, max, min, sum, m2, mean)
 ```
 
 CounterId is a string following this convention: `counterRoleName->counterRoleUnit->counterName->marker`.
 
+## markers_counters
+
+```
+nodeId => counterId1, counterId2, counterId3....
+```
+
 ## gauges
 
 ```
@@ -78,7 +87,15 @@ nodeId => gaugeId1, gaugeId2, gaugeId3..
 ## statuses
 
 ```
-nodeId => (validationName1 => (validationDescription1, validationStatus1)), (validationName2 => (validationDescription2, validationStatus2)), ...
+validationId => (validationDescription1, validationStatus1)
+```
+
+Note: validationId follows this convention: `validationName->marker`
+
+## markers_statuses
+
+```
+nodeId => validationId1, validationId2, validationId3....
 ```
 
 ## CQL samples
@@ -92,76 +109,252 @@ cqlsh> use sirona;
 ### Show gauges by node
 
 ```
-cqlsh:sirona> select * from markers_gauges;
-
- key          | column1                  | value
---------------+--------------------------+-------
- 0x6e6f646531 |            CPU->u->node1 |    0x
- 0x6e6f646531 |    Used Memory->u->node1 |    0x
-```
-
-### Show gauges values
-
-```
- cqlsh:sirona> select * from gauges_values;
-
-  key                        | column1       | value
- ----------------------------+---------------+--------------------
-0x4350552d3e752d3e6e6f646531 | 1384245545000 | 0x3fef5c28f5c28f5c
-0x4350552d3e752d3e6e6f646531 | 1384245549000 | 0x3ff23d70a3d70a3d
-```
-
-### Show counters
-
-```
-cqlsh:sirona> select * from counters;
-
- key          | column1                                                                             | column2        | value
---------------+-------------------------------------------------------------------------------------+----------------+----------------------------------------------------------------------------------------------------------------------------------------
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |            key |                                           0x73656c65637420312066726f6d20494e464f524d4154494f4e5f534348454d412e53595354454d5f5553455253
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |             m2 |                                                                                                                     0x427486ed44071b60
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |            max |                                                                                                                     0x4133b39100000000
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 | maxConcurrency |                                                                                                                             0x00000000
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |           mean |                                                                                                                     0x4100520e86bca1b0
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |            min |                                                                                                                     0x40e6c38000000000
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |              n |                                                                                                                     0x0000000000000026
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |           role |                                                                                                                             0x6a646263
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |            sum |                                                                                                                     0x4153617140000000
- 0x6e6f646531 |                      jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1 |       variance |                                                                                                                     0x4221c0cd33ea788a
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |            key |                                         0x6f72672e737570657262697a2e64656d6f2e7369726f6e612e416e456a622e7363686564756c65644d6574686f64
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |             m2 |                                                                                                                     0x4273955f57d89e6f
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |            max |                                                                                                                     0x41320d5400000000
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 | maxConcurrency |                                                                                                                             0x00000000
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |           mean |                                                                                                                     0x40f43b50c7ce0c7c
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |            min |                                                                                                                     0x40dae5c000000000
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |              n |                                                                                                                     0x0000000000000029
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |           role |                                                                                                             0x706572666f726d616e636573
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |            sum |                                                                                                                     0x4149ebff80000000
- 0x6e6f646531 |             performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1 |       variance |                                                                                                                     0x421f5565595a9718
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |            key |                                                                                               0x73657373696f6e2d6475726174696f6e732d2f
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |             m2 |                                                                                                                     0x7ff8000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |            max |                                                                                                                     0x7ff8000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 | maxConcurrency |                                                                                                                             0x00000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |           mean |                                                                                                                     0x7ff8000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |            min |                                                                                                                     0x7ff8000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |              n |                                                                                                                     0x0000000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |           role |                                                                                                   0x73657373696f6e2d6475726174696f6e73
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |            sum |                                                                                                                     0x0000000000000000
- 0x6e6f646531 |                                   session-durations->ns->session-durations-/->node1 |       variance |                                                                                                                     0x7ff8000000000000
-```
-
-### Show statuses
-
-```
-cqlsh:sirona> select * from statuses;
-
- key          | column1                         | column2     | value
---------------+---------------------------------+-------------+--------------------------------------------------------------------------
- 0x6e6f646531 | tomee-datasource-ROOT/jdbc/demo | description | 0x76616c69646174696f6e20717565727920657865637574656420636f72726563746c79
- 0x6e6f646531 | tomee-datasource-ROOT/jdbc/demo |      status |                                                                   0x4f4b
- 0x6e6f646531 |             tomee-datasource-db | description | 0x76616c69646174696f6e20717565727920657865637574656420636f72726563746c79
- 0x6e6f646531 |             tomee-datasource-db |      status |                                                                   0x4f4b
- 0x6e6f646531 |                   validation #1 | description |                                                 0x616c6c2069732066696e65
- 0x6e6f646531 |                   validation #1 |      status |                                                                   0x4f4b
+[default@sirona] list counters_values;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 73657373696f6e2d6475726174696f6e732d3e6e732d3e73657373696f6e2d6475726174696f6e732d2f2d3e7562756e7475
+=> (name=key, value=73657373696f6e2d6475726174696f6e732d2f, timestamp=1384371568101001)
+=> (name=m2, value=7ff8000000000000, timestamp=1384371568101008)
+=> (name=max, value=7ff8000000000000, timestamp=1384371568101005)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371568101002)
+=> (name=mean, value=7ff8000000000000, timestamp=1384371568101009)
+=> (name=min, value=7ff8000000000000, timestamp=1384371568101006)
+=> (name=n, value=0000000000000000, timestamp=1384371568101004)
+=> (name=role, value=73657373696f6e2d6475726174696f6e73, timestamp=1384371568101000)
+=> (name=sum, value=0000000000000000, timestamp=1384371568101007)
+=> (name=variance, value=7ff8000000000000, timestamp=1384371568101003)
+-------------------
+RowKey: 73657373696f6e2d6475726174696f6e732d3e6e732d3e73657373696f6e2d6475726174696f6e732d2f2d3e6e6f646531
+=> (name=key, value=73657373696f6e2d6475726174696f6e732d2f, timestamp=1384371580602001)
+=> (name=m2, value=7ff8000000000000, timestamp=1384371580603004)
+=> (name=max, value=7ff8000000000000, timestamp=1384371580603001)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371580602002)
+=> (name=mean, value=7ff8000000000000, timestamp=1384371580603005)
+=> (name=min, value=7ff8000000000000, timestamp=1384371580603002)
+=> (name=n, value=0000000000000000, timestamp=1384371580603000)
+=> (name=role, value=73657373696f6e2d6475726174696f6e73, timestamp=1384371580602000)
+=> (name=sum, value=0000000000000000, timestamp=1384371580603003)
+=> (name=variance, value=7ff8000000000000, timestamp=1384371580602003)
+-------------------
+RowKey: 706572666f726d616e6365732d3e6e732d3e6f72672e737570657262697a2e64656d6f2e7369726f6e612e416e456a622e7363686564756c65644d6574686f642d3e7562756e7475
+=> (name=key, value=6f72672e737570657262697a2e64656d6f2e7369726f6e612e416e456a622e7363686564756c65644d6574686f64, timestamp=1384371568098001)
+=> (name=m2, value=42623703388470f1, timestamp=1384371568099000)
+=> (name=max, value=41294b4400000000, timestamp=1384371568098005)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371568098002)
+=> (name=mean, value=40f13b14b4b4b4b5, timestamp=1384371568099001)
+=> (name=min, value=40c0b38000000000, timestamp=1384371568098006)
+=> (name=n, value=0000000000000011, timestamp=1384371568098004)
+=> (name=role, value=706572666f726d616e636573, timestamp=1384371568098000)
+=> (name=sum, value=41324ec600000000, timestamp=1384371568098007)
+=> (name=variance, value=42223703388470f1, timestamp=1384371568098003)
+-------------------
+RowKey: 6a6462632d3e6e732d3e6a6462633a7369726f6e613a6873716c64623a6d656d3a64623f64656c65676174654472697665723d6f72672e6873716c64622e6a6462634472697665722d3e7562756e7475
+=> (name=key, value=6a6462633a7369726f6e613a6873716c64623a6d656d3a64623f64656c65676174654472697665723d6f72672e6873716c64622e6a646263447269766572, timestamp=1384371568095001)
+=> (name=m2, value=7ff8000000000000, timestamp=1384371568096001)
+=> (name=max, value=7ff8000000000000, timestamp=1384371568095005)
+=> (name=maxConcurrency, value=00000001, timestamp=1384371568095002)
+=> (name=mean, value=7ff8000000000000, timestamp=1384371568096002)
+=> (name=min, value=7ff8000000000000, timestamp=1384371568095006)
+=> (name=n, value=0000000000000000, timestamp=1384371568095004)
+=> (name=role, value=6a646263, timestamp=1384371568095000)
+=> (name=sum, value=0000000000000000, timestamp=1384371568096000)
+=> (name=variance, value=7ff8000000000000, timestamp=1384371568095003)
+-------------------
+RowKey: 6a6462632d3e6e732d3e6a6462633a7369726f6e613a6873716c64623a6d656d3a64623f64656c65676174654472697665723d6f72672e6873716c64622e6a6462634472697665722d3e6e6f646531
+=> (name=key, value=6a6462633a7369726f6e613a6873716c64623a6d656d3a64623f64656c65676174654472697665723d6f72672e6873716c64622e6a646263447269766572, timestamp=1384371580599001)
+=> (name=m2, value=7ff8000000000000, timestamp=1384371580599008)
+=> (name=max, value=7ff8000000000000, timestamp=1384371580599005)
+=> (name=maxConcurrency, value=00000001, timestamp=1384371580599002)
+=> (name=mean, value=7ff8000000000000, timestamp=1384371580599009)
+=> (name=min, value=7ff8000000000000, timestamp=1384371580599006)
+=> (name=n, value=0000000000000000, timestamp=1384371580599004)
+=> (name=role, value=6a646263, timestamp=1384371580599000)
+=> (name=sum, value=0000000000000000, timestamp=1384371580599007)
+=> (name=variance, value=7ff8000000000000, timestamp=1384371580599003)
+-------------------
+RowKey: 6a6462632d3e6e732d3e73656c65637420312066726f6d20494e464f524d4154494f4e5f534348454d412e53595354454d5f55534552532d3e6e6f646531
+=> (name=key, value=73656c65637420312066726f6d20494e464f524d4154494f4e5f534348454d412e53595354454d5f5553455253, timestamp=1384371580596001)
+=> (name=m2, value=42516f85f2e1e36d, timestamp=1384371580597005)
+=> (name=max, value=41227d8600000000, timestamp=1384371580597002)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371580596002)
+=> (name=mean, value=40f70ce292492491, timestamp=1384371580597006)
+=> (name=min, value=40e696c000000000, timestamp=1384371580597003)
+=> (name=n, value=0000000000000038, timestamp=1384371580597001)
+=> (name=role, value=6a646263, timestamp=1384371580596000)
+=> (name=sum, value=41542b4640000000, timestamp=1384371580597004)
+=> (name=variance, value=41f449eafeb311f3, timestamp=1384371580597000)
+-------------------
+RowKey: 6a6462632d3e6e732d3e73656c65637420312066726f6d20494e464f524d4154494f4e5f534348454d412e53595354454d5f55534552532d3e7562756e7475
+=> (name=key, value=73656c65637420312066726f6d20494e464f524d4154494f4e5f534348454d412e53595354454d5f5553455253, timestamp=1384371568092001)
+=> (name=m2, value=42c2b745705bd777, timestamp=1384371568092008)
+=> (name=max, value=4159dcba80000000, timestamp=1384371568092005)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371568092002)
+=> (name=mean, value=4121c69088888889, timestamp=1384371568092009)
+=> (name=min, value=40f6fbe000000000, timestamp=1384371568092006)
+=> (name=n, value=000000000000000f, timestamp=1384371568092004)
+=> (name=role, value=6a646263, timestamp=1384371568092000)
+=> (name=sum, value=4160aa2780000000, timestamp=1384371568092007)
+=> (name=variance, value=428563bd12b21ad1, timestamp=1384371568092003)
+-------------------
+RowKey: 706572666f726d616e6365732d3e6e732d3e6f72672e737570657262697a2e64656d6f2e7369726f6e612e416e456a622e7363686564756c65644d6574686f642d3e6e6f646531
+=> (name=key, value=6f72672e737570657262697a2e64656d6f2e7369726f6e612e416e456a622e7363686564756c65644d6574686f64, timestamp=1384371580600001)
+=> (name=m2, value=426b5e97084323d9, timestamp=1384371580601004)
+=> (name=max, value=412e7ec600000000, timestamp=1384371580601001)
+=> (name=maxConcurrency, value=00000000, timestamp=1384371580600002)
+=> (name=mean, value=40efa537b9611a7b, timestamp=1384371580601005)
+=> (name=min, value=40d8278000000000, timestamp=1384371580601002)
+=> (name=n, value=000000000000003a, timestamp=1384371580601000)
+=> (name=role, value=706572666f726d616e636573, timestamp=1384371580600000)
+=> (name=sum, value=414cadba80000000, timestamp=1384371580601003)
+=> (name=variance, value=420ebb0c6319fb56, timestamp=1384371580600003)
+
+8 Rows Returned.
+Elapsed time: 71 msec(s).
+[default@sirona] list markers_counters;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 6e6f646531
+=> (name=jdbc->ns->jdbc:sirona:hsqldb:mem:db?delegateDriver=org.hsqldb.jdbcDriver->node1, value=, timestamp=1384371580599010)
+=> (name=jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->node1, value=, timestamp=1384371580597007)
+=> (name=performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->node1, value=, timestamp=1384371580601006)
+=> (name=session-durations->ns->session-durations-/->node1, value=, timestamp=1384371580603006)
+-------------------
+RowKey: 7562756e7475
+=> (name=jdbc->ns->jdbc:sirona:hsqldb:mem:db?delegateDriver=org.hsqldb.jdbcDriver->ubuntu, value=, timestamp=1384371568096003)
+=> (name=jdbc->ns->select 1 from INFORMATION_SCHEMA.SYSTEM_USERS->ubuntu, value=, timestamp=1384371568092010)
+=> (name=performances->ns->org.superbiz.demo.sirona.AnEjb.scheduledMethod->ubuntu, value=, timestamp=1384371568099002)
+=> (name=session-durations->ns->session-durations-/->ubuntu, value=, timestamp=1384371568101010)
+
+2 Rows Returned.
+Elapsed time: 29 msec(s).
+[default@sirona] list gauges_values;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 2f2d485454502d3330312d3e752d3e6e6f646531
+=> (name=1384371524000, value=0000000000000000, timestamp=1384371524377000)
+=> (name=1384371528000, value=0000000000000000, timestamp=1384371528342000)
+=> (name=1384371532000, value=0000000000000000, timestamp=1384371532335001)
+=> (name=1384371536000, value=0000000000000000, timestamp=1384371536327001)
+=> (name=1384371540000, value=0000000000000000, timestamp=1384371540337000)
+=> (name=1384371544000, value=0000000000000000, timestamp=1384371544323000)
+=> (name=1384371548000, value=0000000000000000, timestamp=1384371548333000)
+=> (name=1384371552000, value=0000000000000000, timestamp=1384371552334000)
+=> (name=1384371556000, value=0000000000000000, timestamp=1384371556337000)
+=> (name=1384371560000, value=0000000000000000, timestamp=1384371560337000)
+=> (name=1384371564000, value=0000000000000000, timestamp=1384371564334000)
+=> (name=1384371568000, value=0000000000000000, timestamp=1384371568325000)
+=> (name=1384371572000, value=0000000000000000, timestamp=1384371572338000)
+=> (name=1384371576000, value=0000000000000000, timestamp=1384371576332000)
+=> (name=1384371580000, value=0000000000000000, timestamp=1384371580329000)
+-------------------
+RowKey: 4350552d3e752d3e6e6f646531
+=> (name=1384371523000, value=3ffd1eb851eb851f, timestamp=1384371524379000)
+=> (name=1384371527000, value=3ffc000000000000, timestamp=1384371527656000)
+=> (name=1384371531000, value=3ff9c28f5c28f5c3, timestamp=1384371531656000)
+=> (name=1384371535000, value=3ff9c28f5c28f5c3, timestamp=1384371535656000)
+=> (name=1384371539000, value=3ff7ae147ae147ae, timestamp=1384371539658001)
+=> (name=1384371543000, value=3ff9c28f5c28f5c3, timestamp=1384371543655000)
+=> (name=1384371547000, value=3ffa3d70a3d70a3d, timestamp=1384371547656000)
+=> (name=1384371551000, value=3ff970a3d70a3d71, timestamp=1384371551656001)
+=> (name=1384371555000, value=3ff970a3d70a3d71, timestamp=1384371555656001)
+=> (name=1384371559000, value=3ff75c28f5c28f5c, timestamp=1384371559656000)
+=> (name=1384371563000, value=3ff8000000000000, timestamp=1384371563655000)
+=> (name=1384371567000, value=3ff6147ae147ae14, timestamp=1384371567654000)
+=> (name=1384371571000, value=3ff599999999999a, timestamp=1384371571655000)
+=> (name=1384371575000, value=3ff599999999999a, timestamp=1384371575655000)
+=> (name=1384371579000, value=3ff51eb851eb851f, timestamp=1384371579656000)
+
+32 Rows Returned.
+Elapsed time: 168 msec(s).
+[default@sirona] list markers_gauges;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 6e6f646531
+=> (name=/-HTTP-200->u->node1, value=, timestamp=1384371580326000)
+=> (name=/-HTTP-201->u->node1, value=, timestamp=1384371580327000)
+=> (name=/-HTTP-204->u->node1, value=, timestamp=1384371580331000)
+=> (name=/-HTTP-301->u->node1, value=, timestamp=1384371580322001)
+=> (name=/-HTTP-302->u->node1, value=, timestamp=1384371580321000)
+=> (name=/-HTTP-400->u->node1, value=, timestamp=1384371580328000)
+=> (name=/-HTTP-403->u->node1, value=, timestamp=1384371580323000)
+=> (name=/-HTTP-404->u->node1, value=, timestamp=1384371580330000)
+=> (name=/-HTTP-500->u->node1, value=, timestamp=1384371580332000)
+=> (name=CPU->u->node1, value=, timestamp=1384371579654000)
+=> (name=Used Memory->u->node1, value=, timestamp=1384371579656001)
+=> (name=Used Non Heap Memory->u->node1, value=, timestamp=1384371579659000)
+=> (name=jta-active->u->node1, value=, timestamp=1384371580339000)
+=> (name=jta-commited->u->node1, value=, timestamp=1384371580339001)
+=> (name=jta-rollbacked->u->node1, value=, timestamp=1384371580335000)
+=> (name=sessions-/->u->node1, value=, timestamp=1384371580319000)
+-------------------
+RowKey: 7562756e7475
+=> (name=/-HTTP-200->u->ubuntu, value=, timestamp=1384371568559000)
+=> (name=/-HTTP-201->u->ubuntu, value=, timestamp=1384371568547000)
+=> (name=/-HTTP-204->u->ubuntu, value=, timestamp=1384371568567000)
+=> (name=/-HTTP-301->u->ubuntu, value=, timestamp=1384371568545002)
+=> (name=/-HTTP-302->u->ubuntu, value=, timestamp=1384371568545000)
+=> (name=/-HTTP-400->u->ubuntu, value=, timestamp=1384371568561002)
+=> (name=/-HTTP-403->u->ubuntu, value=, timestamp=1384371568545001)
+=> (name=/-HTTP-404->u->ubuntu, value=, timestamp=1384371568553000)
+=> (name=/-HTTP-500->u->ubuntu, value=, timestamp=1384371568559001)
+=> (name=CPU->u->ubuntu, value=, timestamp=1384371568140000)
+=> (name=Used Memory->u->ubuntu, value=, timestamp=1384371568145000)
+=> (name=Used Non Heap Memory->u->ubuntu, value=, timestamp=1384371568147000)
+=> (name=jta-active->u->ubuntu, value=, timestamp=1384371568576000)
+=> (name=jta-commited->u->ubuntu, value=, timestamp=1384371568573000)
+=> (name=jta-rollbacked->u->ubuntu, value=, timestamp=1384371568574000)
+=> (name=sessions-/->u->ubuntu, value=, timestamp=1384371568541000)
+
+2 Rows Returned.
+Elapsed time: 35 msec(s).
+[default@sirona] list statuses_values;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 7562756e74752d3e746f6d65652d64617461736f757263652d524f4f542f6a6462632f64656d6f
+=> (name=description, value=76616c69646174696f6e20717565727920657865637574656420636f72726563746c79, timestamp=1384371568128010)
+=> (name=name, value=746f6d65652d64617461736f757263652d524f4f542f6a6462632f64656d6f, timestamp=1384371568128009)
+=> (name=status, value=4f4b, timestamp=1384371568128011)
+-------------------
+RowKey: 7562756e74752d3e76616c69646174696f6e202331
+=> (name=description, value=616c6c2069732066696e65, timestamp=1384371568128006)
+=> (name=name, value=76616c69646174696f6e202331, timestamp=1384371568128005)
+=> (name=status, value=4f4b, timestamp=1384371568128007)
+-------------------
+RowKey: 6e6f6465312d3e746f6d65652d64617461736f757263652d6462
+=> (name=description, value=76616c69646174696f6e20717565727920657865637574656420636f72726563746c79, timestamp=1384371580630000)
+=> (name=name, value=746f6d65652d64617461736f757263652d6462, timestamp=1384371580629009)
+=> (name=status, value=4f4b, timestamp=1384371580630001)
+-------------------
+RowKey: 6e6f6465312d3e746f6d65652d64617461736f757263652d524f4f542f6a6462632f64656d6f
+=> (name=description, value=76616c69646174696f6e20717565727920657865637574656420636f72726563746c79, timestamp=1384371580630004)
+=> (name=name, value=746f6d65652d64617461736f757263652d524f4f542f6a6462632f64656d6f, timestamp=1384371580630003)
+=> (name=status, value=4f4b, timestamp=1384371580630005)
+-------------------
+RowKey: 6e6f6465312d3e76616c69646174696f6e202331
+=> (name=description, value=616c6c2069732066696e65, timestamp=1384371580629006)
+=> (name=name, value=76616c69646174696f6e202331, timestamp=1384371580629005)
+=> (name=status, value=4f4b, timestamp=1384371580629007)
+
+5 Rows Returned.
+Elapsed time: 33 msec(s).
+[default@sirona] list markers_statuses;
+Using default limit of 100
+Using default cell limit of 100
+-------------------
+RowKey: 6e6f646531
+=> (name=node1->tomee-datasource-ROOT/jdbc/demo, value=, timestamp=1384371580630002)
+=> (name=node1->tomee-datasource-db, value=, timestamp=1384371580629008)
+=> (name=node1->validation #1, value=, timestamp=1384371580629004)
+-------------------
+RowKey: 7562756e7475
+=> (name=ubuntu->tomee-datasource-ROOT/jdbc/demo, value=, timestamp=1384371568128008)
+=> (name=ubuntu->validation #1, value=, timestamp=1384371568128004)
 
+2 Rows Returned.
+Elapsed time: 29 msec(s).
 ```
\ No newline at end of file