Skip to content

Commit

Permalink
Vnext release (#54)
Browse files Browse the repository at this point in the history
* Decisions convergence (#48)

* Implement support for both Decisions products and refactoring

- Made service compatible with ODM and ADS
- Integrated metering model for simplified dependencies
- Renamed packages, options, produced jar file
- Adapted, refactored and reviewed documentation accordingly

* Update copyright notices

* Deliver next release - 8.12.0 (#45)

* Switch to the next version

* Change copyright year: DBACLD-90119

* Pre delivery 812 (#44)

* Prepare new release.

* increase time to run test

* Change liberty version for the next release

* Use a pre-deploy ruleset

* Adapt test after moving to the new rule set

* Prepare next delivery

* Update Chart.yaml - Fix bad odm version

* fix bad version

* Update test.sh

* Update docker-compose.yml Try to add network

* Update docker-compose.yml - Remove network

* Update build-and-test.yml

* Update build-and-test.yml debug

* Update test.sh

* Update test.sh

* Take the new jar file name into account

* Trigger new action build

---------

Co-authored-by: Anthony Acremann <[email protected]>

* Prepare next release

* Update Liberty version

* Update build-and-test.yml

* Update build-and-test.yml

* Update build-and-test.yml - Revert

* Bad reference url

* Update build-and-test.yml - Change Liberty version

* Change for the next release

* Update build-and-test.yml

* Try to workaround issue DBACLD-118818

* Fix location

* Update Chart.yaml

* Update values.yaml

* Update values.yaml

* Move to the new release name 9.0.0

* Linter failed

* DBACLD-125217 Metering service does not store correctly the metrics

* Override delivery to fix issue

* New description for the dockerjub

* DBACLD-125376 Change copyright

* Dbacld 125217 (#50)

* Fix configuration of the service

* DBACLD-125217

* Try to fix Github action

* Fix initVariable syntax

* Fix shell syntax.

* no message

* Debug

* Fix metrics check

* Move to JDK 17

* improve logging

* DBACLD-134790 Change License for the next release

* Prepare next release

* Preprare next release

* Prepare next release

* Update README_ODM.md

* Update Chart.yaml

* Update kuberentes version

* Fix Kubernetes requirement

* Change home url + Kubernetes version

* Try to add artifacthub verified status

* Add markdown link check (#53)

* DBACLD-139987 - Put in place checker link

* ignore some broken links

* ignore broken links with localhost URL

---------

Co-authored-by: Frederic Mercier <[email protected]>

* Fix broken link

* Fix broken link

---------

Co-authored-by: Anthony Acremann <[email protected]>
Co-authored-by: Frederic Mercier <[email protected]>
Co-authored-by: Frederic Mercier <[email protected]>
  • Loading branch information
4 people authored Jun 28, 2024
1 parent 5c03e87 commit 2c1258f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 5 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Check Markdown links

#on:
# push:
# branches:
# - master
# pull_request:
# branches: [master]
on: push
jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
**/**.md
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
use-verbose-mode: 'yes'
config-file: '.md_check_config.json'

14 changes: 14 additions & 0 deletions .md_check_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"ignorePatterns": [
{
"pattern": "^http://localhost"
}
],
"replacementPatterns": [
{
"pattern": "^/LICENSE",
"replacement": "{{BASEURL}}/LICENSE"
}
],
"timeout": "20s"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IBM Decisions usage metering service

[IBM License Metric Tool](https://www.ibm.com/support/knowledgecenter/SS8JFY_9.2.0/com.ibm.lmt.doc/welcome/LMT_welcome.html) inventories IBM software, and monitors its usage and compliance. The Decisions usage metering service produces license files that are compliant with the tool and based on the observed usage of IBM Decisions software.
[IBM License Metric Tool](https://www.ibm.com/docs/en/license-metric-tool) inventories IBM software, and monitors its usage and compliance. The Decisions usage metering service produces license files that are compliant with the tool and based on the observed usage of IBM Decisions software.

## IBM Operational Decision Manager
To configure metering for use with IBM Operation Decision Manager, see the following documentation:[ODM Readme](README_ODM.md)
Expand Down
8 changes: 5 additions & 3 deletions docker/dockerhub/full-description.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ docker pull icr.io/cpopen/odm-k8s/odm-metering-service:9.0-amd64

# Overview

The Operational Decision Manager (ODM) usage metering service image allows you to generate license files that are compliant with the [IBM License Metric Tool](https://www.ibm.com/support/knowledgecenter/SS8JFY_9.2.0/com.ibm.lmt.doc/welcome/LMT_welcome.html). These license files are based on the observed usage of ODM software.
The Operational Decision Manager (ODM) usage metering service image allows you to generate license files that are compliant with the [IBM License Metric Tool](https://www.ibm.com/docs/en/license-metric-tool). These license files are based on the observed usage of ODM software.

See the License section at the end of this page for restrictions on the use of this image.

Expand All @@ -49,18 +49,20 @@ You must accept the license before you launch the image. The license is availabl
docker run -e LICENSE=accept -p 8888:8888 -p 9999:9999 icr.io/cpopen/odm-k8s/odm-metering-service:9.0-amd64
```

When the server is started, use the URL http://localhost:8888 or https://localhost:9999 to display a welcome page.
When the server is started, use the URL http://localhost:8888 or https://localhost:9999 to display a welcome page. <!-- markdown-link-check-disable-line -->

The metering service receives usage information from Operational Decision Manager and aggregates it.

When the service is available, you can get a zip archive of the ILMT files by using the /backup REST API endpoint.
In a browser, access the zip archive by using http://localhost:8888/backup or https://localhost:9999/backup
In a browser, access the zip archive by using http://localhost:8888/backup or https://localhost:9999/backup <!-- markdown-link-check-disable-line -->
or use the following curl command:

<!-- markdown-link-check-disable -->
```console
curl http://localhost:8888/backup -o backup.zip
curl -k https://localhost:9999/backup -o backup.zip
```
<!-- markdown-link-check-enable -->

## Storage

Expand Down
2 changes: 1 addition & 1 deletion topics/dssetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Among the parameters listed in the res-setup task document, the following parame
Parameter | Description
:-: | :-:
metering.api.key | This parameter is not used, but it is mandatory. Use an arbitrary value.
metering.server.url | To be set to the URL where the metering service is run, for example, http://host.company.com:8888/odm-metering-service.
metering.server.url | To be set to the URL where the metering service is run, for example, http://host.company.com:8888/odm-metering-service. <!-- markdown-link-check-disable-line -->
metering.enable | To be set to true so that the metering components can run.
metering.send.usages | To be set to true so that actual usages are sent to the metering service.
metering.instance.identifier | If specified, it is used as a reference to identify a metering client instance within Operational Decision Manager. This information appears in the log of the metering service, so it is recommended to be customized.
Expand Down

0 comments on commit 2c1258f

Please sign in to comment.