Adjust multi-cloud config to avoid extra topics #240
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using collectd-write-qdr.yaml in a multi-cloud configuration, multiple topics will be published to as the defaults in collectd-write-qdr.yaml will be merged with the configured values in the stf-connectors.yaml. Directly load the resource_registry and collectd service directly in the stf-connectors.yaml instead.
leifmadsen
added
needs-backport
csibbitt
approved these changes
Jul 9, 2021
pleimer
approved these changes
Jul 12, 2021
leifmadsen
commented
Jul 12, 2021
...elemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc
Outdated
Show resolved
Hide resolved
…k-environment-file-for-multiple-clouds.adoc
leifmadsen
added
ready for tech writer
...elemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc
Outdated
Show resolved
Hide resolved
...elemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc
Outdated
Show resolved
Hide resolved
…k-environment-file-for-multiple-clouds.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com>
…k-environment-file-for-multiple-clouds.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com>
leifmadsen
added a commit
that referenced
this pull request
Jul 12, 2021
* Adjust multi-cloud config to avoid extra topics When using collectd-write-qdr.yaml in a multi-cloud configuration, multiple topics will be published to as the defaults in collectd-write-qdr.yaml will be merged with the configured values in the stf-connectors.yaml. Directly load the resource_registry and collectd service directly in the stf-connectors.yaml instead. Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Cherry picked from commit dcd9c10
leifmadsen
added a commit
that referenced
this pull request
Jul 12, 2021
* Adjust multi-cloud config to avoid extra topics When using collectd-write-qdr.yaml in a multi-cloud configuration, multiple topics will be published to as the defaults in collectd-write-qdr.yaml will be merged with the configured values in the stf-connectors.yaml. Directly load the resource_registry and collectd service directly in the stf-connectors.yaml instead. Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Cherry picked from commit dcd9c10
JoanneOFlynn2018
added a commit
that referenced
this pull request
Jul 15, 2021
* Jof more wrappers for v13 (#220) * first set of changes * Changes to assembly * version 13->16.1 (#222) * Align OSP13 base configuration for STF (#225) Align the OSP13 base configuration for STF across OSP versions by setting the same default configuration as OSP16 where not defined. Signed-off-by: Leif Madsen <lmadsen@redhat.com> * New assembly for upgrading to 1.2 (#218) * New assembly for upgrading to 1.2. Two new modules Reusing 1 module * Resolve issues with xref linking Cherry picked from commit 4f16e24 Co-authored-by: Leif Madsen <lmadsen@redhat.com> * Use empty list vs object for clouds parameter (#232) The use of an empty clouds object results in an error in Service Telemetry Operator since a list is expected. Using an empty list will result in the expected outcome of no Smart Gateways being defined rather than an error. * Upgrade instructions for STF v1.3 * Update doc-Service-Telemetry-Framework/assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-3.adoc * Update doc-Service-Telemetry-Framework/assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-3.adoc * Update doc-Service-Telemetry-Framework/assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-3.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * 1.2->1.3 (#236) * Configure sensubility to publish to new address (#227) * adjust sensubility publish address * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: Leif Madsen <lmadsen@redhat.com> * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: Leif Madsen <lmadsen@redhat.com> Co-authored-by: Leif Madsen <lmadsen@redhat.com> * Use the stable tag for STF CatalogSource (#229) Instead of having a versioned value for stf-catalog index image (which only contains AMQ Certificate Manager) migrate to using the stable tag instead. * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Adjust multi-cloud config to avoid extra topics (#240) * Adjust multi-cloud config to avoid extra topics When using collectd-write-qdr.yaml in a multi-cloud configuration, multiple topics will be published to as the defaults in collectd-write-qdr.yaml will be merged with the configured values in the stf-connectors.yaml. Directly load the resource_registry and collectd service directly in the stf-connectors.yaml instead. * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> * Updates for new sensubility amqp1 address (#239) * adjust sensubility publish address * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: Leif Madsen <lmadsen@redhat.com> * Update doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc Co-authored-by: Leif Madsen <lmadsen@redhat.com> * updates for new sensubility address * sensubility clarification * Update doc-Service-Telemetry-Framework/modules/proc_planning-amqp-address-prefixes.adoc Co-authored-by: Leif Madsen <lmadsen@redhat.com> * adjustments * some items OSP16 only * All SG output show show 2/2 pods * Update doc-Service-Telemetry-Framework/modules/proc_deploying-smart-gateways.adoc * Update doc-Service-Telemetry-Framework/modules/proc_deploying-smart-gateways.adoc * Update doc-Service-Telemetry-Framework/modules/proc_planning-amqp-address-prefixes.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> * Update doc-Service-Telemetry-Framework/modules/proc_planning-amqp-address-prefixes.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Co-authored-by: Leif Madsen <lmadsen@redhat.com> Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> * Enable Ceilometer events (#244) The upstream ceilometer-write-qdr for Train is not in sync with the contents deployed downstream for ceilometer-write-qdr.yaml. The upstream implements the Publish parameters, but the current 16.1 deployment does not provide those. Added appropriate configuration required for RHOSP16.1. Signed-off-by: Leif Madsen <lmadsen@redhat.com> * Update dashboard import paths for stf-1.3 (#246) Update import paths and add instructions for including new cloud events dashboard * Allow better build controls in Makefile (#250) When building all, build both the html and html13 documents. Add a new 'downstream' option so you can build for downstream testing as well. * Fix output of oc patch command Drop the subs +quotes for the oc patch command so that the content is correctly displayed in the code blocks. * Drop all use of +quotes in upgrade document The upgrade document doesn't need any +quotes subs for the code blocks. Dropping them to avoid any future issues. * Update doc-Service-Telemetry-Framework/assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-3.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc * Update doc-Service-Telemetry-Framework/modules/proc_removing-service-telemetry-framework-1-2-operators.adoc Co-authored-by: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Co-authored-by: pleimer <41337120+pleimer@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using collectd-write-qdr.yaml in a multi-cloud configuration,
multiple topics will be published to as the defaults in
collectd-write-qdr.yaml will be merged with the configured values in the
stf-connectors.yaml. Directly load the resource_registry and collectd
service directly in the stf-connectors.yaml instead.