Skip to content

Allow better build controls in Makefile (#250) #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2021
Merged

Allow better build controls in Makefile (#250) #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64145cb
Allow better build controls in Makefile (#250)
leifmadsen Jul 15, 2021
f1382a2
Fix issue with building OSP13
leifmadsen Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@ all: html

html: all-html

downstream: all-html-downstream

pdf: all-pdf

clean: all-clean

browser: all-browser

all-html:
cd doc-Service-Telemetry-Framework && $(MAKE) html
cd doc-Service-Telemetry-Framework && $(MAKE) html && $(MAKE) html13

all-html-downstream:
cd doc-Service-Telemetry-Framework && $(MAKE) html BUILD=downstream && $(MAKE) html13 BUILD=downstream

all-pdf:
cd doc-Service-Telemetry-Framework && $(MAKE) pdf
Expand Down
21 changes: 9 additions & 12 deletions ...rvice-Telemetry-Framework/modules/proc_creating-openstack-environment-file.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ parameter_defaults:
cloud1-telemetry: # <4>
format: JSON
presettle: true
CollectdEnableSensubility: true # <7>
CollectdEnableSensubility: true # <6>
CollectdSensubilityTransport: amqp1
CollectdSensubilityResultsChannel: collectd/cloud1-notify # <5>
CollectdSensubilityResultsChannel: collectd/cloud1-notify # <7>

MetricsQdrAddresses:
- prefix: collectd
Expand All @@ -180,14 +180,9 @@ parameter_defaults:

MetricsQdrSSLProfiles:
- name: sslProfile
ifdef::include_when_13[]
caCertFileContent: |
----BEGIN CERTIFICATE----
<snip>
----END CERTIFICATE----
endif::include_when_13[]

MetricsQdrConnectors:
- host: stf-default-interconnect-5671-service-telemetry.apps.infra.watch # <6>
- host: stf-default-interconnect-5671-service-telemetry.apps.infra.watch # <5>
port: 443
role: edge
verifyHostname: false
Expand All @@ -199,9 +194,11 @@ endif::include_when_16[]
<2> Define the topic for Ceilometer metrics. This value is the address format of `anycast/ceilometer/cloud1-metering.sample`.
<3> Define the topic for collectd events. This value is the format of `collectd/cloud1-notify`.
<4> Define the topic for collectd metrics. This value is the format of `collectd/cloud1-telemetry`.
<5> Define the topic for collectd-sensubility events. This should be the exact string format of `collectd/cloud1-notify`
<6> Adjust the `MetricsQdrConnectors` host to the address of the {ProjectShort} route.
<7> Enable monitoring of health and API status.
<5> Adjust the `MetricsQdrConnectors` host to the address of the {ProjectShort} route.
ifdef::include_when_16[]
<6> Enable monitoring of health and API status.
<7> Define the topic for collectd-sensubility events. This should be the exact string format of `collectd/cloud1-notify`
endif::include_when_16[]
+
. Ensure that the naming convention in the `stf-connectors.yaml` file aligns with the `spec.amqpUrl` field in the Smart Gateway configuration. For example, configure the `CeilometerQdrEventsConfig.topic` field to a value of `cloud1-event`.

Expand Down