oneacct-export 0.4.4 → 0.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -18
  3. data/lib/one_worker.rb +2 -2
  4. data/lib/oneacct_exporter/version.rb +1 -1
  5. data/mock/one_worker_vm_dn01.xml +6 -4
  6. data/mock/one_worker_vm_dn02.xml +6 -4
  7. data/mock/one_worker_vm_empty_disk_records.xml +6 -4
  8. data/mock/one_worker_vm_empty_history_records.xml +6 -4
  9. data/mock/one_worker_vm_image_name01.xml +6 -4
  10. data/mock/one_worker_vm_image_name02.xml +6 -4
  11. data/mock/one_worker_vm_image_name03.xml +6 -4
  12. data/mock/one_worker_vm_image_name04.xml +6 -4
  13. data/mock/one_worker_vm_image_name05.xml +6 -4
  14. data/mock/one_worker_vm_image_name06.xml +6 -4
  15. data/mock/one_worker_vm_number_of_public_ips_01.xml +6 -4
  16. data/mock/one_worker_vm_number_of_public_ips_02.xml +6 -4
  17. data/mock/one_worker_vm_number_of_public_ips_03.xml +6 -4
  18. data/mock/one_worker_vm_search_benchmark_01.xml +6 -4
  19. data/mock/one_worker_vm_search_benchmark_02.xml +6 -4
  20. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7c97727a09636b7edebe37a73fd01907ecf90dba
4
- data.tar.gz: 6611ef8ab87262b8fc76117eacf42278bf422aef
3
+ metadata.gz: 11028660948ab1ebf4a066115c4960f512820d61
4
+ data.tar.gz: 3691aad825f365b05f56f442b3ea19ec217d5324
5
5
  SHA512:
6
- metadata.gz: a2ba6173efd943e3bbd01850a089b5135f7ce94fccbb2f7ecc75b67cfda1b0d76d18a88ad29ab8c361c159943ab4cae9f16acaa064b6a4c881aaa87b3fc81e26
7
- data.tar.gz: 3db730a269e531b8a48667275479e26d587cb12f98ae3a1055461304451458f753316dac4b8bd76cf881a4cdd5a3ea6d7d04a7a60c7dd1030fde38c01b18c7ae
6
+ metadata.gz: 19760d8348e1d2777971987487720256e16f8ec2656b5123199588995250f8979c899f3b33d11b894af92a5085ec55ca8fc9cfe85cb0dadbbbb64ee5b6ba5ef7
7
+ data.tar.gz: 5a775489516d588cacc82c382291d113132cae0d5fcd10f4bfad94b3656ee42c43bde1bb0be6b565c45fadbacd4a821d6a1c9bd0a4c38028f91c908f6a87a83c
data/README.md CHANGED
@@ -120,24 +120,8 @@ INHERIT_IMAGE_ATTR = "VMCATCHER_EVENT_HV_VERSION"
120
120
  In order to recognize and fill `BenchmarkType` and `Benchmark` APEL v0.4 fields,
121
121
  two attributes have to be set for every host in OpenNebula:
122
122
  * `BENCHMARK_TYPE` - represents benchmark's type. For example: `HEP-SPEC06`
123
- * `BENCHMARK_VALUES` - represents a map of virtual machine instance types and
124
- their measured values of said benchmark formatted as JSON. For example:
125
- ```
126
- {
127
- "http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#atlas":312.39,
128
- "http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large":146.64,
129
- "http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#goliath":255.80,
130
- "http://fedcloud.egi.eu/occi/compute/flavour/1.0#large":84.46
131
- }
132
- ```
133
- Virtual machine instance types are in form of OCCI `scheme#term` of `resource_tpl` mixins.
134
- You can list your mixins via OCCI cli utility with command
135
- ```
136
- occi --endpoint $ENDPOINT -a list -r resource_tpl
137
- ```
138
-
139
- To check whether the value is correctly formatted use one of the JSON format validators and formatters, for example
140
- [https://jsonformatter.curiousconcept.com/](https://jsonformatter.curiousconcept.com/).
123
+ * `BENCHMARK_VALUE` - represents a per-core measured value of said benchmark.
124
+ For example: `84.46`
141
125
 
142
126
  Both attributes can be set both for clusters and hosts in OpenNebula with hosts'
143
127
  attributes taking precedence. If attributes are set only for cluster, all hosts
data/lib/one_worker.rb CHANGED
@@ -120,8 +120,8 @@ class OneWorker
120
120
  data['status_code'] = vm['STATE']
121
121
  data['status'] = vm.state_str
122
122
  data['cpu_count'] = vm['TEMPLATE/VCPU']
123
- data['network_inbound'] = vm['NET_TX']
124
- data['network_outbound'] = vm['NET_RX']
123
+ data['network_inbound'] = vm['MONITORING/NETTX']
124
+ data['network_outbound'] = vm['MONITORING/NETRX']
125
125
  data['memory'] = vm['TEMPLATE/MEMORY']
126
126
  data['image_name'] = vm['TEMPLATE/DISK[1]/VMCATCHER_EVENT_AD_MPURI']
127
127
  data['image_name'] ||= image_map[vm['TEMPLATE/DISK[1]/IMAGE_ID']]
data/lib/oneacct_exporter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class OneacctExporter
2
- VERSION = '0.4.4'
2
+ VERSION = '0.4.5'
3
3
  end
data/mock/one_worker_vm_dn01.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_dn02.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_empty_disk_records.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_empty_history_records.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name01.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name02.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name03.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name04.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name05.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_image_name06.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_number_of_public_ips_01.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_number_of_public_ips_02.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_number_of_public_ips_03.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_search_benchmark_01.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
data/mock/one_worker_vm_search_benchmark_02.xml CHANGED
@@ -23,10 +23,12 @@
23
23
  <STIME>1383741160</STIME>
24
24
  <ETIME>1383742270</ETIME>
25
25
  <DEPLOY_ID>one-36551</DEPLOY_ID>
26
- <MEMORY>1736960</MEMORY>
27
- <CPU>0</CPU>
28
- <NET_TX>43557888</NET_TX>
29
- <NET_RX>376832</NET_RX>
26
+ <MONITORING>
27
+ <MEMORY>1736960</MEMORY>
28
+ <CPU>0</CPU>
29
+ <NETTX>43557888</NETTX>
30
+ <NETRX>376832</NETRX>
31
+ </MONITORING>
30
32
  <TEMPLATE>
31
33
  <CONTEXT>
32
34
  <DISK_ID><![CDATA[1]]></DISK_ID>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oneacct-export
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.4
4
+ version: 0.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michal Kimle
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-25 00:00:00.000000000 Z
11
+ date: 2017-02-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler