Skip to content

Commit 2d65aa2

Browse files
Merge pull request killbill#670 from reshmabidikar/minor-corrections
Minor doc corrections
2 parents 897e2d3 + d54d108 commit 2d65aa2

5 files changed

Lines changed: 78 additions & 78 deletions

File tree

html5/_main_toc.html.slim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ nav.sidebar-nav
7373
li
7474
a.nav-link href="/latest/userguide_payment.html"
7575
| Payment Processing
76-
li
77-
a.nav-link href="/latest/userguide_configuration.html"
78-
| Kill Bill Configuration
7976
li
8077
a.nav-link href="/latest/internationalization.html"
8178
| Internationalization
@@ -134,6 +131,9 @@ nav.sidebar-nav
134131
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5024 5.70711C10.1119 6.09763 9.47871 6.09763 9.08818 5.70711L5.7953 2.41421L2.50241 5.70711C2.11188 6.09763 1.47872 6.09763 1.0882 5.70711C0.697672 5.31658 0.697672 4.68342 1.0882 4.29289L5.08819 0.292893C5.47871 -0.0976311 6.11188 -0.0976311 6.5024 0.292893L10.5024 4.29289C10.8929 4.68342 10.8929 5.31658 10.5024 5.70711Z" fill="#D1D5DB"/>
135132
</svg>
136133
ul.nav.navbar-nav
134+
li
135+
a.nav-link href="/latest/userguide_configuration.html"
136+
| Kill Bill Configuration
137137
li
138138
a.nav-link href="/latest/userguide_deployment.html"
139139
| Going to Production
@@ -430,4 +430,4 @@ nav.sidebar-nav
430430
| Invoice Subsystem
431431
li
432432
a.nav-link href="/latest/development.html"
433-
| Development Environment
433+
| Development Environment Setup

userguide/aviate/aviate-health.adoc

Lines changed: 70 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -97,77 +97,6 @@ The metrics exposed by the Aviate plugin can mainly be categorized in the follow
9797

9898
|===
9999

100-
=== Runtime Properties
101-
102-
Properties can be specified to configure the Kill Bill system including its plugins. The following https://docs.killbill.io/latest/userguide_configuration#configuration_properties_table[documentation] shows the main configuration properties.
103-
104-
The values for these properties can come from multiple sources, each with a defined precedence.
105-
106-
==== Property Resolution Order (Highest to Lowest)
107-
Kill Bill resolves property values in the following order, where higher precedence sources override lower ones:
108-
109-
* Immutable System Property
110-
111-
Includes the `user.timezone` property, which is force set to `GMT`.
112-
113-
This property cannot be overridden.
114-
115-
* Environment Variables
116-
117-
Properties prefixed with `KB_org_` (for example, `KB_org_killbill_dao_url` maps to `org.killbill.dao.url`).
118-
119-
These are loaded only when `org.killbill.server.lookupEnvironmentVariables` is set to `true` (this is enabled by default).
120-
121-
These properties take the highest precedence among other configurable sources.
122-
123-
* Runtime Configuration
124-
125-
Properties loaded from a configuration file specified via `-Dorg.killbill.server.properties=<propertyFile>`.
126-
127-
If no file is specified, Kill Bill uses JVM system properties defined via `-Dproperty=value`.
128-
129-
This source has the second-highest precedence among configurable sources.
130-
131-
* Kill Bill Defaults
132-
133-
These are default values defined within the Kill Bill codebase.
134-
135-
They are registered dynamically by various *Config classes during application startup, covering configuration domains such as CatalogConfig, DaoConfig, LifecycleConfig, SecurityConfig, InvoiceConfig, PaymentConfig, OSGIConfig, and others.
136-
137-
The following defaults are applied only when a property is not defined in any higher precedence source:
138-
139-
----
140-
org.killbill.persistent.bus.external.tableName=bus_ext_events
141-
org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
142-
org.killbill.server.enableJasypt=false
143-
org.killbill.server.lookupEnvironmentVariables=true
144-
org.slf4j.simpleLogger.log.jdbc=ERROR
145-
----
146-
147-
When a property is defined in multiple sources, Kill Bill applies the value from the highest precedence source and logs a warning indicating which sources defined it and which value was chosen.
148-
149-
Example warning:
150-
151-
----
152-
Property conflict detected for 'org.killbill.dao.healthCheckConnectionTimeout':
153-
defined in sources [RuntimeConfiguration, EnvironmentVariables] -
154-
using value from 'EnvironmentVariables': '11s'
155-
----
156-
157-
158-
To make it easier to understand the runtime values of these properties, Kill Bill provides the https://apidocs.killbill.io/aviate-health.html#retrieve-runtime-configuration[/v1/health/config] endpoint.
159-
This endpoint displays the effective configuration currently in use along with information about which source each property value was derived from.
160-
161-
162-
==== Per-Tenant Configuration
163-
164-
In addition to system-wide properties, Kill Bill supports per-tenant configuration, allowing tenants to override specific system properties for their own environment.
165-
166-
This provides fine-grained control in multi-tenant deployments, enabling different tenants to customize selected settings while still inheriting defaults from the global configuration.
167-
168-
For more details, see the official documentation: https://docs.killbill.io/latest/userguide_configuration#_per_tenant_properties.
169-
170-
171100
=== Queue Metrics
172101

173102
Queue metrics can be used to assess the health of the Kill Bill internal queues.
@@ -314,6 +243,76 @@ The following metrics are timer metrics and provide different data points for th
314243
|===
315244

316245

246+
== Runtime Properties
247+
248+
Properties can be specified to configure the Kill Bill system including its plugins. The following https://docs.killbill.io/latest/userguide_configuration#configuration_properties_table[documentation] shows the main configuration properties.
249+
250+
The values for these properties can come from multiple sources, each with a defined precedence.
251+
252+
=== Property Resolution Order (Highest to Lowest)
253+
Kill Bill resolves property values in the following order, where higher precedence sources override lower ones:
254+
255+
* Immutable System Property
256+
257+
Includes the `user.timezone` property, which is force set to `GMT`.
258+
259+
This property cannot be overridden.
260+
261+
* Environment Variables
262+
263+
Properties prefixed with `KB_org_` (for example, `KB_org_killbill_dao_url` maps to `org.killbill.dao.url`).
264+
265+
These are loaded only when `org.killbill.server.lookupEnvironmentVariables` is set to `true` (this is enabled by default).
266+
267+
These properties take the highest precedence among other configurable sources.
268+
269+
* Runtime Configuration
270+
271+
Properties loaded from a configuration file specified via `-Dorg.killbill.server.properties=<propertyFile>`.
272+
273+
If no file is specified, Kill Bill uses JVM system properties defined via `-Dproperty=value`.
274+
275+
This source has the second-highest precedence among configurable sources.
276+
277+
* Kill Bill Defaults
278+
279+
These are default values defined within the Kill Bill codebase.
280+
281+
They are registered dynamically by various *Config classes during application startup, covering configuration domains such as CatalogConfig, DaoConfig, LifecycleConfig, SecurityConfig, InvoiceConfig, PaymentConfig, OSGIConfig, and others.
282+
283+
The following defaults are applied only when a property is not defined in any higher precedence source:
284+
285+
----
286+
org.killbill.persistent.bus.external.tableName=bus_ext_events
287+
org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
288+
org.killbill.server.enableJasypt=false
289+
org.killbill.server.lookupEnvironmentVariables=true
290+
org.slf4j.simpleLogger.log.jdbc=ERROR
291+
----
292+
293+
When a property is defined in multiple sources, Kill Bill applies the value from the highest precedence source and logs a warning indicating which sources defined it and which value was chosen.
294+
295+
Example warning:
296+
297+
----
298+
Property conflict detected for 'org.killbill.dao.healthCheckConnectionTimeout':
299+
defined in sources [RuntimeConfiguration, EnvironmentVariables] -
300+
using value from 'EnvironmentVariables': '11s'
301+
----
302+
303+
304+
To make it easier to understand the runtime values of these properties, Kill Bill provides the https://apidocs.killbill.io/aviate-health.html#retrieve-runtime-configuration[/v1/health/config] endpoint.
305+
This endpoint displays the effective configuration currently in use along with information about which source each property value was derived from.
306+
307+
308+
=== Per-Tenant Configuration
309+
310+
In addition to system-wide properties, Kill Bill supports per-tenant configuration, allowing tenants to override specific system properties for their own environment.
311+
312+
This provides fine-grained control in multi-tenant deployments, enabling different tenants to customize selected settings while still inheriting defaults from the global configuration.
313+
314+
For more details, see the official documentation: https://docs.killbill.io/latest/userguide_configuration#_per_tenant_properties.
315+
317316
== Sample API Requests and Responses
318317

319318
NOTE: All API calls in this section require a valid `ID_TOKEN`. See https://docs.killbill.io/latest/aviate-authentication.html[Aviate Authentication] for instructions on how to obtain one.

userguide/aviate/how-to-install-the-aviate-plugin.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ com.killbill.billing.plugin.aviate.enableMigrations=false
7878
----
7979

8080
When this property has been set to false, latest schema can be installed manually from the following links - depending on your database engine:
81+
8182
* https://docs.killbill.io/latest/aviate-mysql-ddl.sql[Aviate MySQL DDL]
8283
* https://docs.killbill.io/latest/aviate-postgresql-ddl.sql[Aviate PostgreSQL DDL]
8384

userguide/tutorials/email-notification-plugin.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To send an email the following is required:
3737
3838
== Plugin Installation
3939
40-
A plugin can be installed either via https://docs.killbill.io/latest/userguide_kaui.html[__Kaui__] or https://github.com/killbill/killbill-cloud/blob/master/kpm[_KPM_]. In order to install a plugin via Kaui, please refer to the https://docs.killbill.io/latest/plugin_installation.html#_installing_via_kaui[__Plugin Installation Instructions__] document. In order to install a plugin via kpm, you may follow the steps given below:
40+
A plugin can be installed either via https://docs.killbill.io/latest/plugin_installation.html#_installing_via_kaui[__Kaui__] or https://github.com/killbill/killbill-cloud/blob/master/kpm[__KPM__] or https://docs.killbill.io/latest/plugin_installation#_installing_via_aviate_marketplace[_Aviate UI_]. In order to install a plugin via kpm, you may follow the steps given below:
4141
4242
. Ensure that you have kpm installed as explained https://github.com/killbill/killbill-cloud/tree/master/kpm#kpm-installation[here].
4343
@@ -46,7 +46,7 @@ A plugin can be installed either via https://docs.killbill.io/latest/userguide_k
4646
kpm install_java_plugin email-notifications --destination=<path_to_install_plugin>
4747
4848
. Verify that the plugin is installed properly. This can be done by ensuring that the plugin JAR is present at the `path_to_install_plugin` specified in the previous step. Alternatively, you can also open `kpm` in https://docs.killbill.io/latest/userguide_kaui.html[Kaui] and verify that the email notification plugin is running as follows:
49-
49+
+
5050
image::https://github.com/killbill/killbill-docs/raw/v3/userguide/assets/img/email-notification-plugin/kaui_email_notification_plugin.png[align=center]
5151
5252
. If you would like to make changes to the plugin, you can clone the plugin code, build and deploy it as explained https://github.com/killbill/killbill-email-notifications-plugin[here].

userguide/tutorials/plugin_installation.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ kpm install_java_plugin '<plugin-key>'
143143

144144
=== Installing via Aviate Marketplace
145145

146-
The https://aviate.killbill.io[Aviate marketplace] provides a user-friendly interface to discover, install, and manage Kill Bill plugins directly from your browser. For this, you will need to have an Aviate Flock account and add your local KB instance as a deployment.
146+
The https://aviate.killbill.io[Aviate marketplace] provides a user-friendly interface to discover, install, and manage Kill Bill plugins directly from your browser. For this, you will need to have an Aviate Flock account and add your local KB instance as a deployment. Refer to https://docs.killbill.io/latest/aviate-deployment-management[_Aviate Deployment Management documentation] for more details on how add your local KB instance as a deployment.
147147

148148
Refer to the following demo for a walkthrough of the plugin installation process via the Aviate marketplace:
149149

0 commit comments

Comments
 (0)