More changes in OVN monitoring

This patch introduces the following changes.
1. The ovn_monitoring.sh script has been changed to accurately depict
the row count in each table.
2. Adding stack user to wheel group has been moved to after the container
has been built and is running.

Change-Id: I2e7fed2fd3245832689521cd5d7f544f5a476254

ansible/install/roles/collectd/tasks/main.yml

@@ -83,13 +83,6 @@
     dest: "{{ browbeat_containers_path }}/collectd-openstack/config/collectd.conf"
   when: "config_type == 'compute' and ovn_compute_collectd_plugin"
 
-- name: Add stack user to wheel
-  shell: |
-    podman exec -it -u root collectd-controller usermod -G wheel stack
-  become: yes
-  become_user: root
-  when: "config_type == 'controller' and ovn_monitoring"
-
 - name: Build and Run container
   block:
     - name: Build collectd-openstack container
@@ -118,3 +111,10 @@
           {% endif %}
           collectd-openstack
       become: yes
+
+- name: Add stack user to wheel
+  shell: |
+    podman exec -it -u root collectd-controller usermod -G wheel stack
+  become: yes
+  become_user: root
+  when: "config_type == 'controller' and ovn_monitoring"

browbeat-containers/collectd-openstack/files/ovn_monitoring.sh

@@ -4,5 +4,6 @@ INTERVAL="${COLLECTD_INTERVAL:-15}"
 
 while sleep "$INTERVAL"; do
   VALUE=$(sudo ovsdb-client dump --no-headings unix:/var/lib/openvswitch/ovn/ovn$1_db.sock $2 | wc -l)
+  VALUE=$[VALUE-1]
   echo "PUTVAL \"$HOSTNAME/ovn-$1db-$2/gauge-ovn_$1db_$2\" interval=$INTERVAL N:$VALUE"
 done