Skip to content

Commit 9052576

Browse files
committed
Merge branch 'main' into feature/helm-deployment
Signed-off-by: Thomas Telleis <[email protected]>
2 parents d28cf05 + 97d9c90 commit 9052576

File tree

165 files changed

+5682
-4639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+5682
-4639
lines changed

.github/workflows/pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ jobs:
7575
run: task clean build
7676

7777
- name: upload artifact
78-
uses: actions/upload-pages-artifact@v1
78+
uses: actions/upload-pages-artifact@v3
7979
with:
8080
# Upload entire repository
8181
path: 'site'
8282

8383
- name: deploy to gitHub pages
8484
id: deployment
85-
uses: actions/deploy-pages@v1
85+
uses: actions/deploy-pages@v4
8686

CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ Have a look at the [mkdocs-material documentation](https://squidfunk.github.io/m
9494

9595
</details>
9696

97+
## Icons
98+
99+
Where possible, please use icons as described on [the material for mkdocs documention](https://squidfunk.github.io/mkdocs-material/reference/icons-emojis/).
100+
On this page is search function for icons available as well.
101+
97102
## Admonitions
98103

99104
<details>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If you consider to contribute to this project, please have a look on [CONTRIBUTI
1313

1414
## License
1515

16-
Copyright © 2024 [eccenca GmbH](https://eccenca.com)
16+
Copyright © 2025 [eccenca GmbH](https://eccenca.com)
1717

1818
This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License][cc-by-sa].
1919

Taskfile.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ version: '3'
55

66
vars:
77
PUBLIC_BRANCH: published
8-
CURRENT_VERSION: 24.1
9-
MATERIAL_TAG: 9.5.17
10-
MATERIAL_INSIDER_TAG: 9.5.17-insiders-4.53.6
8+
CURRENT_VERSION: 25.2
9+
MATERIAL_TAG: 9.6.14
10+
MATERIAL_INSIDER_TAG: 9.6.14-insiders-4.53.16
1111

1212
tasks:
1313

@@ -108,7 +108,7 @@ tasks:
108108
desc: re-generates the cmemc command reference
109109
cmds:
110110
- rm -rf {{.REFERENCE_DIR}}/*
111-
- CMEMC_MANUAL_DIR={{.REFERENCE_DIR}} cmemc -q config
111+
- cmemc manual --format markdown-multi-page --output-dir {{.REFERENCE_DIR}}
112112
vars:
113113
REFERENCE_DIR: docs/automate/cmemc-command-line-interface/command-reference
114114

docs/assets/extra.css

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,43 @@ img.bordered {
163163
margin-top: 0.125em;
164164
}
165165

166+
/**
167+
* simplify layout for print:
168+
* - only use logo and page title from header
169+
* - remove footer completely
170+
* - remove whitespace around main content
171+
* - remove comment section
172+
*/
173+
@media print {
174+
body {
175+
background-color: transparent;
176+
}
177+
.md-header {
178+
box-shadow: none;
179+
background-color: transparent;
180+
}
181+
.md-header__inner {
182+
padding: 0;
183+
margin: 0 0.8rem;
184+
max-width: none;
185+
}
186+
.md-header__inner > * {
187+
display: none !important;
188+
}
189+
.md-header__inner > .md-logo,
190+
.md-header__inner > .md-header__title {
191+
display: inline-block !important;
192+
margin: 0;
193+
}
194+
195+
.md-footer {
196+
display: none !important;
197+
}
198+
.md-main__inner {
199+
max-width: none;
200+
margin: 0;
201+
}
202+
#__comments, .giscus {
203+
display: none !important;
204+
}
205+
}

docs/automate/cmemc-command-line-interface/command-reference/admin/acl/index.md

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,40 @@ $ cmemc admin acl create [OPTIONS]
7171

7272

7373

74+
With this command, new access conditions can be created.
75+
76+
An access condition captures information about WHO gets access to WHAT. In order to specify WHO gets access, use the ``--user`` and / or ``--group`` options. In order to specify WHAT an account get access to, use the ``--read-graph``, ``--write-graph`` and ``--action`` options.`
77+
78+
In addition to that, you can specify a name, a description and an ID (all optional).
79+
80+
A special case are dynamic access conditions, based on a SPARQL query: Here you have to provide a query with the projection variables `user`, `group` `readGraph` and `writeGraph` to create multiple grants at once. You can either provide a query file or a query URL from the query catalog.
81+
82+
!!! note
83+
Queries for dynamic access conditions are copied into the ACL, so changing the query in the query catalog does not change it in the access condition.
84+
85+
86+
```shell-session title="Example"
87+
$ cmemc admin acl create --group local-users --write-graph https://example.org/
88+
```
89+
90+
91+
7492

7593
??? info "Options"
7694
```text
7795

78-
--name TEXT A short name or label.
79-
--id TEXT An optional ID (will be an UUID otherwise).
80-
--description TEXT An optional description.
8196
--user TEXT A specific user account required by the access
8297
condition.
8398
--group TEXT A membership in a user group required by the access
84-
condition
99+
condition.
85100
--read-graph TEXT Grants read access to a graph.
86101
--write-graph TEXT Grants write access to a graph (includes read access).
87102
--action TEXT Grants usage permissions to an action / functionality.
103+
--query TEXT Dynamic access condition query (file or the query
104+
catalog IRI).
105+
--id TEXT An optional ID (will be an UUID otherwise).
106+
--name TEXT A optional name.
107+
--description TEXT An optional description.
88108
```
89109

90110
## admin acl update
@@ -105,15 +125,17 @@ Given an access condition URL, you can change specific options to new values.
105125
??? info "Options"
106126
```text
107127

108-
--name TEXT A short name or label.
128+
--name TEXT A optional name.
109129
--description TEXT An optional description.
110130
--user TEXT A specific user account required by the access
111131
condition.
112132
--group TEXT A membership in a user group required by the access
113-
condition
133+
condition.
114134
--read-graph TEXT Grants read access to a graph.
115135
--write-graph TEXT Grants write access to a graph (includes read access).
116136
--action TEXT Grants usage permissions to an action / functionality.
137+
--query TEXT Dynamic access condition query (file or the query
138+
catalog IRI).
117139
```
118140

119141
## admin acl delete
@@ -153,7 +175,7 @@ $ cmemc admin acl review [OPTIONS] USER
153175

154176

155177

156-
This command has two working modes: (1) You can review the access conditions of an actual account - this needs access to keycloak and the access condition API, (2) You can review the access conditions of an imaginary account with a set of freely added groups (what-if-scenario) - this only needs access to the access condition API.
178+
This command has two working modes: (1) You can review the access conditions of an actual account, (2) You can review the access conditions of an imaginary account with a set of freely added groups (what-if-scenario).
157179

158180
The output of the command is a list of grants the account has based on your input and all access conditions loaded in the store. In addition to that, some metadata of the account is shown.
159181

docs/automate/cmemc-command-line-interface/command-reference/admin/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $ cmemc admin status [OPTIONS]
2626

2727
This command outputs version and health information of the selected deployment. If the version information cannot be retrieved, UNKNOWN is shown.
2828

29-
Additionally, this command informs you in one of these cases: (1) A warning, if the target version of your cmemc client is newer than the version of your backend. (2) A warning, if the ShapeCatalog has a different version than your DataPlatform component. (3) An error, if your Corporate Memory license is expired (grace period). (4) A warning, if your Graph DB license will expire in less than a month.
29+
Additionally, this command informs you in one of these cases: (1) A warning, if the target version of your cmemc client is newer than the version of your backend. (2) A warning, if the ShapeCatalog has a different version than your Explore component. (3) An error, if your Corporate Memory license is expired (grace period). (4) A warning, if your Graph DB license will expire in less than a month.
3030

3131
To get status information of all configured deployments use this command in combination with parallel.
3232

docs/automate/cmemc-command-line-interface/command-reference/admin/metrics/index.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ A metric of a specific job is identified by a metric ID. Possible metric IDs of
3535
??? info "Options"
3636
```text
3737

38-
--job [DP] The job from which the metrics data is fetched.
39-
[default: DP]
4038
--filter <TEXT TEXT>... A set of label name/value pairs in order to filter
4139
the samples of the requested metric family. Each
4240
metric has a different set of labels with different
@@ -71,7 +69,6 @@ This command outputs the data of a metric. The first table includes basic metada
7169
??? info "Options"
7270
```text
7371

74-
--job [DP] The job from which the metrics data is fetched. [default: DP]
7572
--raw Outputs raw JSON of the table data.
7673
```
7774

@@ -93,9 +90,11 @@ For each metric, the output table shows the metric ID, the type of the metric, a
9390
??? info "Options"
9491
```text
9592

96-
--job [DP] The job from which the metrics data is fetched. [default: DP]
97-
--id-only Lists metric identifier only. This is useful for piping the IDs
98-
into other commands.
99-
--raw Outputs (sorted) JSON dict, parsed from the metrics API output.
93+
--filter <TEXT TEXT>... Filter metrics by one of the following filter names
94+
and a corresponding value: job, name, type, id.
95+
--id-only Lists metric identifier only. This is useful for
96+
piping the IDs into other commands.
97+
--raw Outputs (sorted) JSON dict, parsed from the metrics
98+
API output.
10099
```
101100

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
title: "cmemc: Command Group - admin migration"
3+
description: "List and apply migration recipes."
4+
icon: material/database-arrow-up-outline
5+
tags:
6+
- cmemc
7+
---
8+
# admin migration Command Group
9+
<!-- This file was generated - DO NOT CHANGE IT MANUALLY -->
10+
11+
List and apply migration recipes.
12+
13+
With this command group, you can check your instance for needed migration activities as well as apply them to your data.
14+
15+
Beside an ID and a description, migration recipes have the following metadata: 'First Version' is the first Corporate Memory version, where this recipe is maybe applicable. The recipe will never be applied to a version below this version. 'Tags' is a classification of the recipe with regard to the target data, it migrates.
16+
17+
The following tags are important: `system` recipes target data structures which are needed to run the most basic functionality properly. These recipes can and should be applied after each version upgrade. `user` recipes can change user and / or customizing data. `acl` recipes migrate access condition data. `shapes` recipes migrate shape data. `config` recipes migrate configuration data.
18+
19+
20+
## admin migration list
21+
22+
List migration recipies.
23+
24+
```shell-session title="Usage"
25+
$ cmemc admin migration list [OPTIONS]
26+
```
27+
28+
29+
30+
31+
This command lists all available migration recipies
32+
33+
34+
35+
??? info "Options"
36+
```text
37+
38+
--filter <TEXT TEXT>... Filter migration recipes by one of the following
39+
filter names and a corresponding value: id,
40+
description, first_version, tag.
41+
--id-only Lists only IDs. This is useful for piping the IDs
42+
into other commands.
43+
--raw Outputs raw JSON.
44+
```
45+
46+
## admin migration execute
47+
48+
Execute needed migration recipes.
49+
50+
```shell-session title="Usage"
51+
$ cmemc admin migration execute [OPTIONS] [MIGRATION_ID]
52+
```
53+
54+
55+
56+
57+
This command executes one or more migration recipes. Each recipe has a check method to determine if a migration is needed. In addition to that, the current component version needs to match the specified first-last-version range of the recipe.
58+
59+
Recipes are executed ordered by first_version.
60+
61+
Here are some argument examples, in order to see how to use this command: execute `--all` `--test-only` will list all needed migrations (but not execute them), execute `--filter` tag system will apply all migrations which target system data, execute bootstrap-data will apply bootstrap-data migration if needed.
62+
63+
64+
65+
??? info "Options"
66+
```text
67+
68+
--filter <TEXT TEXT>... Filter migration recipes by one of the following
69+
filter names and a corresponding value: id,
70+
description, first_version, tag.
71+
-a, --all Execute all needed migrations.
72+
--test-only Only test, do not execute migrations.
73+
--id-only Lists only recipe identifier.
74+
```
75+

docs/automate/cmemc-command-line-interface/command-reference/admin/store/index.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ Use ``--remove`` to delete bootstrap data.
6363
The removal of existing bootstrap data will search for resources which are flagged with the isSystemResource property.
6464

6565

66+
!!! note
67+
The import part of this command is equivalent to the 'bootstrap-data' migration recipe
68+
69+
6670

6771

6872
??? info "Options"
@@ -78,7 +82,7 @@ Use ``--remove`` to delete bootstrap data.
7882
Backup all knowledge graphs to a ZIP archive.
7983

8084
```shell-session title="Usage"
81-
$ cmemc admin store export [OPTIONS] BACKUP_FILE
85+
$ cmemc admin store export [OPTIONS] [BACKUP_FILE]
8286
```
8387

8488

@@ -93,8 +97,8 @@ This command will create lots of load on the server. It can take a long time to
9397
??? info "Options"
9498
```text
9599

96-
--overwrite Overwrite existing files. This is a dangerous option, so use it
97-
with care.
100+
--replace Replace existing files. This is a dangerous option, so use it
101+
with care.
98102
```
99103

100104
## admin store import
@@ -116,3 +120,24 @@ This command will create lots of load on the server. It can take a long time to
116120

117121

118122

123+
## admin store migrate
124+
125+
Migrate configuration resources to the current version.
126+
127+
```shell-session title="Usage"
128+
$ cmemc admin store migrate [OPTIONS]
129+
```
130+
131+
132+
133+
134+
This command serves two purposes: (1) When invoked without an option, it lists all migrateable configuration resources. (2) When invoked with the ``--workspaces`` option, it migrates the workspace configurations to the current version.
135+
136+
137+
138+
??? info "Options"
139+
```text
140+
141+
--workspaces Migrate workspace configurations to the current version.
142+
```
143+

0 commit comments

Comments
 (0)