project-koku/nise

OCP volume labels are not correct

dccurtis opened this issue · 0 comments

persistentvolumeclaim_labels is getting values intended for persistentvolume_labels in the storage.csv

---
generators:
  - OCPGenerator:
      start_date: 2-1-2019
      end_date: 2-6-2019
      nodes:
        - node:
          node_name: alpha
          cpu_cores: 2
          memory_gig: 4
          resource_id: 55555555
          namespaces:
            namespace_ci:
              pods:
                - pod:
                  pod_name: pod_name1
                  cpu_request: 5
                  mem_request_gig: 2
                  cpu_limit: 5
                  mem_limit_gig: 2
                  pod_seconds: 3600
                  cpu_usage:
                    2-1-2019: 1
                    2-2-2019: 2
                    2-3-2019: 4
                    2-4-2019: 1
                    2-5-2019: 2
                    2-6-2019: 4
                  mem_usage_gig:
                    2-1-2019: 1
                    2-2-2019: 2
                    2-3-2019: 4
                    2-4-2019: 1
                    2-5-2019: 2
                    2-6-2019: 4
                  labels: label_key1:label_value1|label_key2:label_value2
              volumes:
                - volume:
                  volume_name: pvc-volume_1
                  storage_class: gp2
                  volume_request_gig: 20
                  labels: volume_1:vol_value1|volume_2:vol_value2
                  volume_claims:
                  - volume_claim:
                    volume_claim_name: pod_name1_data
                    pod_name: pod_name1
                    labels: claim_1:claim_value1|claim_2:claim_value2
                    capacity_gig: 5
                    volume_claim_usage_gig:
                      2-1-2019: 1
                      2-2-2019: 2
                      2-3-2019: 3
                      2-4-2019: 4
                      2-5-2019: 3
                      2-6-2019: 4

(nise_fork) ➜  nise_fork git:(master) ✗ head -2 February-2019-my-ocp-cluster-1-ocp_storage_usage.csv
report_period_start,report_period_end,interval_start,interval_end,namespace,pod,persistentvolumeclaim,persistentvolume,storageclass,persistentvolumeclaim_capacity_bytes,persistentvolumeclaim_capacity_byte_seconds,volume_request_storage_byte_seconds,persistentvolumeclaim_usage_byte_seconds,persistentvolume_labels,persistentvolumeclaim_labels
2019-02-01 00:00:00 +0000 UTC,2019-03-01 00:00:00 +0000 UTC,2019-02-01 00:00:00 +0000 UTC,2019-02-01 01:00:00 +0000 UTC,namespace_ci,pod_name1,pod_name1_data,pvc-volume_1,gp2,5368709120,19327352832000,77309411328000,3865470566400,volume_1:vol_value1|volume_2:vol_value2,volume_1:vol_value1|volume_2:vol_value2
(nise_fork) ➜  nise_fork git:(master) ✗

Archive.zip