Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ DB_NAME=amp_core
DB_HEALTHCHECK_USER=healthcheck
DB_HEALTHCHECK_PASSWORD=healthcheck

OPENSEARCH_INITIAL_ADMIN_PASSWORD=Bw1YckbI3jroOxVnaQHm

GRAFANA_CONTAINER_PORT=3000
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
GRAFANA_PROXIES_PATH=localhost/grafana
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ testresults.xml
# local build files
/anms-core/build/
/anms-ui/release/
docker-compose.override.yml

# Javascript and ESLint related content to be ignored
node_modules
Expand Down
2 changes: 1 addition & 1 deletion deps/dtnma-ace
Submodule dtnma-ace updated 54 files
+5 −1 .github/workflows/build-test.yaml
+3 −1 .github/workflows/codeql.yml
+3 −1 .github/workflows/docs.yaml
+4 −4 .github/workflows/formatting.yaml
+1 −1 .readthedocs.yaml
+1 −1 CODE_OF_CONDUCT.md
+1 −1 CONTRIBUTING.md
+3 −8 README.md
+1 −1 apply_format.sh
+2 −2 apply_license.sh
+1 −1 build_docs.sh
+1 −1 check_format.sh
+1 −1 docs/conf.py
+1 −1 pyproject.toml
+1 −1 src/ace/__init__.py
+1 −1 src/ace/adm_set.py
+14 −6 src/ace/adm_yang.py
+107 −9 src/ace/ari.py
+133 −18 src/ace/ari_cbor.py
+2 −1 src/ace/ari_text/__init__.py
+33 −3 src/ace/ari_text/encode.py
+4 −4 src/ace/ari_text/lexmod.py
+96 −13 src/ace/ari_text/parsemod.py
+1 −1 src/ace/ari_text/util.py
+1 −1 src/ace/cborutil.py
+1 −1 src/ace/constraints/__init__.py
+1 −1 src/ace/constraints/basic.py
+1 −1 src/ace/constraints/core.py
+1 −1 src/ace/lookup.py
+1 −1 src/ace/models.py
+6 −1 src/ace/nickname.py
+1 −1 src/ace/pyang/admtree.py
+1 −1 src/ace/pyang/dtnma_adm.py
+1 −1 src/ace/pyang/dtnma_amm.py
+1 −1 src/ace/tools/__init__.py
+1 −1 src/ace/tools/ace_adm.py
+1 −1 src/ace/tools/ace_ari.py
+21 −12 src/ace/type_constraint.py
+58 −43 src/ace/typing.py
+1 −1 src/ace/util.py
+1 −1 tests/__init__.py
+1 −1 tests/test_adm_set.py
+1 −1 tests/test_adm_yang.py
+42 −6 tests/test_ari.py
+93 −98 tests/test_ari_cbor.py
+6 −1 tests/test_ari_roundtrip.py
+29 −2 tests/test_ari_text.py
+1 −1 tests/test_constraints.py
+1 −1 tests/test_lookup.py
+1 −1 tests/test_models.py
+1 −1 tests/test_nickname.py
+1 −1 tests/test_tools_ace_ari.py
+1 −1 tests/test_typing.py
+1 −1 tests/util.py
2 changes: 1 addition & 1 deletion deps/dtnma-camp
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,15 @@ services:
opensearch:
profiles: ["full"]
hostname: opensearch
image: docker.io/opensearchproject/opensearch:2.0.0
image: docker.io/opensearchproject/opensearch:2.19.5
restart: unless-stopped
security_opt:
- "label=type:opensearch.process"
environment:
- discovery.type=single-node
- bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
- "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD}"
# privileged: true # doesn't work
# ulimits: # acuses permission error
# memlock:
Expand All @@ -106,7 +107,7 @@ services:
opensearch-dashboards:
profiles: ["full"]
hostname: opensearch-dashboards
image: docker.io/opensearchproject/opensearch-dashboards:2.0.0
image: docker.io/opensearchproject/opensearch-dashboards:2.19.5
restart: unless-stopped
security_opt:
- "label=type:opensearch-dashboards.process"
Expand Down
Loading