Merge commit 'octo/st/netapp' into st/netapp

diff --cc src/netapp.c
index 446f8bf,613fa65..e247e83
--- 1/src/netapp.c
--- 2/src/netapp.c
+++ b/src/netapp.c
@@@ -1523,12 -1689,7 +1704,9 @@@ static int cna_init(void) { /* {{{ *
                        } else if (service->handler == query_volume_perf_data) {
                                service->query = na_elem_new("perf-object-get-instances");
                                na_child_add_string(service->query, "objectname", "volume");
- /*                            e = na_elem_new("instances");
-                               na_child_add_string(e, "foo", "system");
-                               na_child_add(root, e);*/
                                e = na_elem_new("counters");
 +                              /* "foo" means: This string has to be here but
 +                                 the content doesn't matter. */
                                na_child_add_string(e, "foo", "read_ops");
                                na_child_add_string(e, "foo", "write_ops");
                                na_child_add_string(e, "foo", "read_data");