Skip to content

CLOUDSTACK-9998: Fix metrics generation failurein prometheus exporter#2325

Merged
yadvr merged 1 commit into
apache:masterfrom
shapeblue:prometheus-fix
Nov 16, 2017
Merged

CLOUDSTACK-9998: Fix metrics generation failurein prometheus exporter#2325
yadvr merged 1 commit into
apache:masterfrom
shapeblue:prometheus-fix

Conversation

@yadvr
Copy link
Copy Markdown
Member

@yadvr yadvr commented Nov 15, 2017

This fixes metrics generation failures when metrics capacities are null.

Pinging for review @ustcweizhou @nvazquez @DaanHoogland @borisstoyanov and others.

@yadvr
CLOUDSTACK-9998: Fix metrics generation failurein prometheus exporter
0ec5631 
This fixes metrics generation failures when metrics capacities are null.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Nov 15, 2017

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 15, 2017

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 15, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1255

@ustcweizhou
Copy link
Copy Markdown
Contributor

ustcweizhou commented Nov 15, 2017

LGTM

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Nov 15, 2017

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 15, 2017

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Nov 15, 2017

Trillian test result (tid-1654)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33353 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2325-t1654-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_host_annotations.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 59 look OK, 4 have error(s)

Test Result Time (s) Test File
test_01_vpc_remote_access_vpn Failure 60.91 test_vpc_vpn.py
test_07_resize_fail Failure 15.35 test_volumes.py
test_04_rvpc_privategw_static_routes Failure 263.75 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 173.08 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 117.78 test_privategw_acl.py
test_01_vpc_privategw_acl Failure 61.77 test_privategw_acl.py
test_05_add_annotation_for_invalid_entityType Error 0.07 test_host_annotations.py
test_change_service_offering_for_vm_with_snapshots Skipped 0.00 test_vm_snapshots.py
test_09_copy_delete_template Skipped 0.02 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.02 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.02 test_ssvm.py
test_01_scale_vm Skipped 0.00 test_scale_vm.py
test_01_primary_storage_iscsi Skipped 0.09 test_primary_storage.py
test_vm_nic_adapter_vmxnet3 Skipped 0.00 test_nic_adapter_type.py
test_03_nic_multiple_vmware Skipped 1.09 test_nic.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_list_ha_for_host_valid Skipped 0.03 test_hostha_simulator.py
test_list_ha_for_host_invalid Skipped 0.04 test_hostha_simulator.py
test_list_ha_for_host Skipped 0.03 test_hostha_simulator.py
test_hostha_enable_feature_without_setting_provider Skipped 0.04 test_hostha_simulator.py
test_hostha_enable_feature_valid Skipped 0.04 test_hostha_simulator.py
test_hostha_disable_feature_valid Skipped 0.06 test_hostha_simulator.py
test_hostha_configure_invalid_provider Skipped 0.03 test_hostha_simulator.py
test_hostha_configure_default_driver Skipped 0.06 test_hostha_simulator.py
test_ha_verify_fsm_recovering Skipped 0.03 test_hostha_simulator.py
test_ha_verify_fsm_fenced Skipped 0.05 test_hostha_simulator.py
test_ha_verify_fsm_degraded Skipped 0.02 test_hostha_simulator.py
test_ha_verify_fsm_available Skipped 0.03 test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownership Skipped 0.03 test_hostha_simulator.py
test_ha_list_providers Skipped 0.02 test_hostha_simulator.py
test_ha_enable_feature_invalid Skipped 0.03 test_hostha_simulator.py
test_ha_disable_feature_invalid Skipped 0.04 test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzones Skipped 0.03 test_hostha_simulator.py
test_configure_ha_provider_valid Skipped 0.02 test_hostha_simulator.py
test_configure_ha_provider_invalid Skipped 0.03 test_hostha_simulator.py
test_hostha_kvm_host_degraded Skipped 26.11 test_hostha_kvm.py
test_deploy_vgpu_enabled_vm Skipped 0.03 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

@resmo
Copy link
Copy Markdown
Member

resmo commented Nov 15, 2017

LGTM

@yadvr yadvr merged commit 4fda0c0 into apache:master Nov 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yadvr @blueorangutan @ustcweizhou @resmo