/*
 * Copyright 2015 Red Hat, Inc. and/or its affiliates
 * and other contributors as indicated by the @author tags.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.hawkular.agent.monitor.scheduler.polling.dmr;

import org.hawkular.agent.monitor.scheduler.polling.KeyGenerator;
import org.hawkular.agent.monitor.scheduler.polling.Task;
import org.hawkular.agent.monitor.service.ServerIdentifiers;

/**
 * Resolve data input attributes to final storage name.
 */
public abstract class DMRTaskKeyGenerator implements KeyGenerator {

    /**
     * This is used to generate keys for tasks that are not associated with any inventoried resource.
     * @param task the task whose key is to be generated
     * @return the generated key that uniquely identifies the data that is collected by the task
     */
    protected String generateDefaultKey(Task task) {
        DMRTask dmrTask = (DMRTask) task;
        StringBuilder key = new StringBuilder();
        ServerIdentifiers serverId = dmrTask.getEndpoint().getServerIdentifiers();
        if (serverId == null) {
            throw new RuntimeException(String.format("Cannot generate key for task [%s]", task));
        }
        key.append(serverId.getFullIdentifier());
        key.append(".").append(dmrTask.getAddress().toAddressPathString());
        if (dmrTask.getSubref() != null && !dmrTask.getSubref().isEmpty()) {
            key.append(".").append(dmrTask.getSubref());
        }
        return key.toString();
    }
}

@@ -1810,24 +1810,80 @@
 hString());%0A
+        key.append(%22.%22).append(dmrTask.getAttribute());%0A
         if (

Update DMRTaskKeyGenerator.java