)]}'
{"id":"openstack%2Fwatcher~952898","triplet_id":"openstack%2Fwatcher~stable%2F2025.1~I3038dec20612162c411fc77446e86a47e0354423","project":"openstack/watcher","branch":"stable/2025.1","topic":"fix-instance-cpu-stable/2025.1","attention_set":{},"removed_from_attention_set":{"16312":{"account":{"_account_id":16312,"name":"Alfredo Moralejo","email":"amoralej@redhat.com","username":"amoralej"},"last_update":"2025-07-08 12:41:34.000000000","reason":"Change was submitted"}},"hashtags":[],"change_id":"I3038dec20612162c411fc77446e86a47e0354423","subject":"Aggregate by label when querying instance cpu usage in prometheus","status":"MERGED","created":"2025-06-19 14:54:56.000000000","updated":"2025-07-08 12:42:50.000000000","submitted":"2025-07-08 12:41:34.000000000","submitter":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"total_comment_count":1,"unresolved_comment_count":0,"has_review_started":true,"submission_id":"952898-fix-instance-cpu-stable/2025.1","cherry_pick_of_change":952364,"cherry_pick_of_patch_set":1,"meta_rev_id":"e922cd4e6f4d7cedbca59605f2ecc3219279bbf0","_number":952898,"virtual_id_number":952898,"owner":{"_account_id":16312,"name":"Alfredo Moralejo","email":"amoralej@redhat.com","username":"amoralej"},"actions":{},"labels":{"Verified":{"approved":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"all":[{"value":0,"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},{"tag":"autogenerated:zuul:gate","value":2,"date":"2025-07-08 12:41:33.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","default_value":0,"optional":true},"Code-Review":{"approved":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"all":[{"value":2,"date":"2025-07-01 15:34:50.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","default_value":0,"optional":true},"Workflow":{"approved":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"all":[{"value":1,"date":"2025-07-08 12:00:09.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true},"Review-Priority":{"all":[{"value":0,"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}],"values":{" 0":"Standard Change","+1":"Important Change","+2":"High Priority Change"},"default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2025-06-19 15:55:29.000000000","updated_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"reviewer":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"state":"REVIEWER"},{"updated":"2025-07-01 15:34:50.000000000","updated_by":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"reviewer":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"state":"REVIEWER"}],"messages":[{"id":"de1e1e30625da8eb1f01157c0a50fb2638d418b5","tag":"autogenerated:gerrit:newPatchSet","author":{"_account_id":16312,"name":"Alfredo Moralejo","email":"amoralej@redhat.com","username":"amoralej"},"date":"2025-06-19 14:54:56.000000000","message":"Patch Set 1: Cherry Picked from branch master.","accounts_in_message":[],"_revision_number":1},{"id":"58471e67b7209e8a03e9322eb756a152264c5886","tag":"autogenerated:zuul:check","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-06-19 15:55:29.000000000","message":"Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/9fcc2677834c47fd85a7dd6a80382bd2\n\n- openstack-tox-cover https://zuul.opendev.org/t/openstack/build/e29ee5d533984650b037e646cd8e9053 : SUCCESS in 5m 55s\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/f1b7661b44534949bc15c54521cd69c6 : SUCCESS in 4m 03s\n- openstack-tox-py39 https://zuul.opendev.org/t/openstack/build/03970f9a07a0436d8882e44853db96b1 : SUCCESS in 4m 54s\n- openstack-tox-py312 https://zuul.opendev.org/t/openstack/build/09610bba5ce2487c86476da0aebecbf3 : SUCCESS in 4m 07s\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/b5cf0375ead74a6e971d8bcf9c3b6532 : SUCCESS in 7m 25s\n- watcher-tempest-functional https://zuul.opendev.org/t/openstack/build/30bb0ae9a1b84fb599ca16ba881eeb06 : SUCCESS in 22m 52s\n- watcher-tempest-functional-jammy https://zuul.opendev.org/t/openstack/build/205a12f7dde2432abf89c4f9e56588af : SUCCESS in 23m 25s\n- watcher-grenade https://zuul.opendev.org/t/openstack/build/024b1ac9b41247d3a7285d8fee123657 : SUCCESS in 42m 17s\n- watcher-tempest-strategies https://zuul.opendev.org/t/openstack/build/1ed90010b1da46b9a2128476bcfc0056 : SUCCESS in 45m 50s\n- watcher-tempest-actuator https://zuul.opendev.org/t/openstack/build/035ed6a5d4584d008ae654993d4b2d49 : SUCCESS in 40m 00s\n- watcherclient-tempest-functional https://zuul.opendev.org/t/openstack/build/b90315995eb042d69130eb82dbf121a6 : SUCCESS in 30m 08s\n- watcher-tempest-functional-ipv6-only https://zuul.opendev.org/t/openstack/build/56bb1a85061d427bbc747574dceb17b4 : SUCCESS in 38m 42s\n- watcher-prometheus-integration https://zuul.opendev.org/t/openstack/build/2816463608d24e359f5aed911b1ee2fd : SUCCESS in 56m 05s","accounts_in_message":[],"_revision_number":1},{"id":"a312cf5b56cf0d661ba547325701c12d8faafefb","author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"date":"2025-07-01 15:34:50.000000000","message":"Patch Set 1: Code-Review+2\n\n(1 comment)","accounts_in_message":[],"_revision_number":1},{"id":"deaa6de1703b124a7ec0a8b7f832dd9c29e9b71b","author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"date":"2025-07-08 12:00:09.000000000","message":"Patch Set 1: Workflow+1","accounts_in_message":[],"_revision_number":1},{"id":"e74c4da5658020395e7dfb75da50dc0c181a4971","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-07-08 12:00:34.000000000","message":"Patch Set 1: -Verified\n\nStarting gate jobs.","accounts_in_message":[],"_revision_number":1},{"id":"ccf1ebd5c581f58e0da3171c4255a8c7f02631e4","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-07-08 12:41:33.000000000","message":"Patch Set 1: Verified+2\n\nBuild succeeded (gate pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/aa2f7963d92b4e76bd35323b0f914ced\n\n- openstack-tox-pep8 https://zuul.opendev.org/t/openstack/build/e1f642667a51473ea6665e22f32e530c : SUCCESS in 4m 08s\n- openstack-tox-py39 https://zuul.opendev.org/t/openstack/build/23d03c883db847118ed658b36b92c8dc : SUCCESS in 4m 46s\n- openstack-tox-py312 https://zuul.opendev.org/t/openstack/build/1f87bde65fea4575bdf438e9fa4c6f68 : SUCCESS in 4m 41s\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/2a3daa5650974cd4bcbc08770cae8102 : SUCCESS in 5m 21s\n- watcher-tempest-functional https://zuul.opendev.org/t/openstack/build/85ef3649499e455e89c772ba626e1d28 : SUCCESS in 23m 24s\n- watcher-tempest-functional-jammy https://zuul.opendev.org/t/openstack/build/a39b6c68ef784d559c1b35ea7f7add0e : SUCCESS in 27m 23s\n- watcher-tempest-functional-ipv6-only https://zuul.opendev.org/t/openstack/build/4baeeb9f798140ab82d4ed5375066d26 : SUCCESS in 24m 39s","accounts_in_message":[],"_revision_number":1},{"id":"be26c19f8b9c3d60e794fe779022655c1a421774","tag":"autogenerated:gerrit:merged","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-07-08 12:41:34.000000000","message":"Change has been successfully merged","accounts_in_message":[],"_revision_number":1},{"id":"e922cd4e6f4d7cedbca59605f2ecc3219279bbf0","tag":"autogenerated:zuul:promote","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2025-07-08 12:42:50.000000000","message":"Patch Set 1:\n\nBuild succeeded (promote pipeline).\nhttps://zuul.opendev.org/t/openstack/buildset/b19ecdbdc4ab42f69cb346de5f5b516a\n\n- promote-openstack-tox-docs https://zuul.opendev.org/t/openstack/build/ef926eb1f692480396ff4c2d1bb95a74 : SUCCESS in 38s","accounts_in_message":[],"_revision_number":1}],"current_revision_number":1,"current_revision":"53872f9af2842312f1a20ff5bad7a51eb49b8648","revisions":{"53872f9af2842312f1a20ff5bad7a51eb49b8648":{"kind":"REWORK","_number":1,"created":"2025-06-19 14:54:56.000000000","uploader":{"_account_id":16312,"name":"Alfredo Moralejo","email":"amoralej@redhat.com","username":"amoralej"},"ref":"refs/changes/98/952898/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/watcher","ref":"refs/changes/98/952898/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/watcher refs/changes/98/952898/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/watcher refs/changes/98/952898/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/watcher refs/changes/98/952898/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/watcher refs/changes/98/952898/1"}}},"commit":{"parents":[{"commit":"f4bfb105252fe674562ecc4a4c138603d60dd72d","subject":"[host_maintenance] Pass des hostname in add_action solution","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/watcher/commit/f4bfb105252fe674562ecc4a4c138603d60dd72d"}]}],"author":{"name":"Alfredo Moralejo","email":"amoralej@redhat.com","date":"2025-06-11 12:40:23.000000000","tz":120},"committer":{"name":"Alfredo Moralejo","email":"amoralej@redhat.com","date":"2025-06-19 14:54:56.000000000","tz":0},"subject":"Aggregate by label when querying instance cpu usage in prometheus","message":"Aggregate by label when querying instance cpu usage in prometheus\n\nCurrently, when the prometheus datasource query ceilometer_cpu metric\nfor instance cpu usage, it aggregates by instance and filter by the\nlabel containing the instance uuid. While this works fine in real\nscenarios, where a single metric is provided in a single instance, in\nsome cases as the CI jobs where metrics are directly injected, leads to\nincorrect metric calculation.\n\nWe applied a similar fix for the host metrics in [1] but we did not\nimplement it for instance cpu.\n\nI am also converting the query formatting to the dict format to improve\nunderstability.\n\n[1] https://review.opendev.org/c/openstack/watcher/+/946049\n\nCloses-Bug: #2113936\nChange-Id: I3038dec20612162c411fc77446e86a47e0354423\n(cherry picked from commit 3860de0b1efba2101615ae782ba6aab3de0964e0)\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/watcher/commit/53872f9af2842312f1a20ff5bad7a51eb49b8648"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/watcher/commit/53872f9af2842312f1a20ff5bad7a51eb49b8648"}]},"branch":"refs/heads/stable/2025.1"}},"requirements":[],"submit_records":[{"rule_name":"gerrit~DefaultSubmitRule","status":"CLOSED","labels":[{"label":"Verified","status":"MAY","applied_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]}},{"label":"Code-Review","status":"MAY","applied_by":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"}},{"label":"Workflow","status":"MAY","applied_by":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"}}]}],"submit_requirements":[{"name":"Verified","description":"Verified in gate by CI","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Verified\u003dMAX AND -label:Verified\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Verified\u003dMAX"],"failing_atoms":["label:Verified\u003dMIN"],"atom_explanations":{}}},{"name":"Code-Review","description":"Code reviewed by core reviewer","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Code-Review\u003dMAX AND -label:Code-Review\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Code-Review\u003dMAX"],"failing_atoms":["label:Code-Review\u003dMIN"],"atom_explanations":{}}},{"name":"Workflow","description":"Approved for gate by core reviewer","status":"SATISFIED","is_legacy":false,"submittability_expression_result":{"expression":"label:Workflow\u003dMAX AND -label:Workflow\u003dMIN","fulfilled":true,"status":"PASS","passing_atoms":["label:Workflow\u003dMAX"],"failing_atoms":["label:Workflow\u003dMIN"],"atom_explanations":{}}}]}