Skip to content

Commit 39bef7f

Browse files
committed
Merge branch 'develop' into mpconfig-personororg
# Conflicts: # src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java
2 parents 9a5a102 + 86568b5 commit 39bef7f

File tree

110 files changed

+2537
-1367
lines changed

Some content is hidden

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

110 files changed

+2537
-1367
lines changed

conf/solr/solrconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
have some sort of hard autoCommit to limit the log size.
239239
-->
240240
<autoCommit>
241-
<maxTime>${solr.autoCommit.maxTime:30000}</maxTime>
241+
<maxTime>${solr.autoCommit.maxTime:300000}</maxTime>
242242
<openSearcher>false</openSearcher>
243243
</autoCommit>
244244

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### Solr Indexing speed improved
2+
3+
The performance of Solr indexing has been significantly improved, particularly for datasets with many files.
4+
5+
A new dataverse.solr.min-files-to-use-proxy microprofile setting can be used to further improve performance/lower memory requirements for datasets with many files (e.g. 500+) (defaults to Integer.MAX, disabling use of the new functionality)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
### Feature: Added dvObject and type fields to Featured Items
2+
3+
Dataverse Featured Items can now be linked to Dataverses, Datasets, or Datafiles.
4+
5+
Pre-existing featured items as well as new items without dvObjects will be defaulted to type=custom.
6+
7+
Featured Items with dvObjects will be filtered out of lists if the dvObject should not be viewed (i.e. datafiles that are restricted or datasets that are deaccessioned)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### File Version Summary Bug fix
2+
3+
Fixes an issue where the deaccessionedReason was missing in the fileDifferenceSummary json object returned by API GET "$SERVER_URL/api/files/{ID}/versionDifferences"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The `dataverse.files.hide-schema-dot-org-download-urls` setting now supports configuration via MicroProfile Config. In addition to the existing `asadmin` JVM option method, any [supported MicroProfile Config API source](https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html) can now be used to set its value.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Not sure what is already in the notes w.r.t. counter-processor updates (separate repo) so I'll try to be ~complete here
2+
3+
### Make Data Count improvements
4+
5+
Counter-processor, used to power Make Data Count metrics in Dataverse is now maintained in the https://github.com/gdcc/counter-processor repository. Multiple improvements to efficiency and scalability have been made. The example counter_daily.sh and counter_weekly.sh scripts that automate using counter-processor, available from the MDC section of the Dataverse Guides (https://guides.dataverse.org/en/latest/admin/make-data-count.html) have been updated to work with the latest counter-processor release and also have minor improvements.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Unfortunately, the [Whole Tale](https://wholetale.org) project is no longer active and has been removed from the list of integrations in the Admin Guide.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
### Improved efficiency for per-request Filters
2+
3+
This release improves the performance of Dataverse's per-request handling of CORS Headers and API calls
4+
5+
It adds new jvm-options/Microprofile settings replacing the now deprecated database settings.
6+
7+
Additional changes:
8+
9+
- CORS headers can now be configured with a list of desired origins, methods, and allowed and exposed headers.
10+
- An 'X-Dataverse-unblock-key' header has been added that can be used instead of the less secure 'unblock-key' query parameter when the :BlockedApiPolicy is set to 'unblock-key'
11+
- Warnings have been added to the log if the Blocked Api settings are misconfigured or if the key is weak (when the "unblock-key" policy is used)
12+
- The new `dataverse.api.blocked.key` can be configured using Payara password aliases or other secure storage options.
13+
14+
New JvmSettings:
15+
- `dataverse.cors.origin`: Allowed origins for CORS requests
16+
- `dataverse.cors.methods`: Allowed HTTP methods for CORS requests
17+
- `dataverse.cors.headers.allow`: Allowed headers for CORS requests
18+
- `dataverse.cors.headers.expose`: Headers to expose in CORS responses
19+
- `dataverse.api.blocked.policy`: Policy for blocking API endpoints
20+
- `dataverse.api.blocked.endpoints`: List of API endpoints to be blocked (comma-separated)
21+
- `dataverse.api.blocked.key`: Key for unblocking API endpoints
22+
23+
Deprecated database settings:
24+
- `:AllowCors`
25+
- `:BlockedApiPolicy`
26+
- `:BlockedApiEndpoints`
27+
- `:BlockedApiKey`
28+
29+
30+
Upgrade instructions:
31+
32+
The deprecated database settings will continue to work in this version. To use the new settings (which are more efficient),
33+
34+
If :AllowCors is not set or is true:
35+
bin/asadmin create-jvm-options -Ddataverse.cors.origin=*
36+
37+
Optionally set origin to a list of hosts and/or set other CORS JvmSettings
38+
Your currently blocked API endpoints can be found at http://localhost:8080/api/admin/settings/:BlockedApiEndpoints
39+
40+
Copy them into the new setting with the following command. As with the deprecated setting, the endpoints should be comma-separated.
41+
42+
bin/asadmin create-jvm-options '-Ddataverse.api.blocked.endpoints=<current :BlockedApiEndpoints>'
43+
44+
If :BlockedApiPolicy is set and is not 'drop'
45+
bin/asadmin create-jvm-options '-Ddataverse.api.blocked.policy=<current :BlockedApiPolicy>'
46+
47+
If :BlockedApiPolicy is 'unblock-key' and :BlockedApiKey is set
48+
49+
`echo "API_BLOCKED_KEY_ALIAS=<value of :BlockedApiKey>" > /tmp/dataverse.api.blocked.key.txt`
50+
51+
`sudo -u dataverse /usr/local/payara6/bin/asadmin create-password-alias --passwordfile /tmp/dataverse.api.blocked.key.txt`
52+
53+
When you are prompted "Enter the value for the aliasname operand", enter `api_blocked_key_alias`
54+
55+
You should see "Command create-password-alias executed successfully."
56+
57+
bin/asadmin create-jvm-options '-Ddataverse.api.blocked.key=${ALIAS=api_blocked_key_alias}'
58+
59+
Restart Payara:
60+
61+
service payara restart
62+
63+
Check server.log to verify that your new settings are in effect.
64+
65+
Cleanup: delete deprecated settings:
66+
curl -X DELETE http://localhost:8080/api/admin/settings/:AllowCors
67+
curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiEndpoints
68+
curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiPolicy
69+
curl -X DELETE http://localhost:8080/api/admin/settings/:BlockedApiKey
70+
Lines changed: 13 additions & 0 deletions
Loading

doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Tool Type Scope Description
22
Data Explorer explore file "A GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis. The latest version incorporates the Data Curation Tool, a GUI for curating data by adding labels, groups, weights and other details to assist with informed reuse. See the README.md file at https://github.com/scholarsportal/Dataverse-Data-Explorer for the instructions on adding Data Explorer to your Dataverse."
3-
Whole Tale explore dataset "A platform for the creation of reproducible research packages that allows users to launch containerized interactive analysis environments based on popular tools such as Jupyter and RStudio. Using this integration, Dataverse users can launch Jupyter and RStudio environments to analyze published datasets. For more information, see the `Whole Tale User Guide <https://wholetale.readthedocs.io/en/stable/users_guide/integration.html>`_."
43
Binder explore dataset Binder allows you to spin up custom computing environments in the cloud (including Jupyter notebooks) with the files from your dataset. See https://github.com/IQSS/dataverse-binder-redirect for installation instructions.
54
File Previewers explore file "A set of tools that display the content of files - including audio, html, `Hypothes.is <https://hypothes.is/>`_ annotations, images, PDF, Markdown, text, video, tabular data, spreadsheets, GeoJSON, zip, and NcML files - allowing them to be viewed without downloading the file. The previewers can be run directly from github.io, so the only required step is using the Dataverse API to register the ones you want to use. Documentation, including how to optionally brand the previewers, and an invitation to contribute through github are in the README.md file. Initial development was led by the Qualitative Data Repository and the spreasdheet previewer was added by the Social Sciences and Humanities Open Cloud (SSHOC) project. https://github.com/gdcc/dataverse-previewers"
65
Ask the Data query file Ask the Data is an experimental tool that allows you ask natural language questions about the data contained in Dataverse tables (tabular data). See the README.md file at https://github.com/IQSS/askdataverse/tree/main/askthedata for the instructions on adding Ask the Data to your Dataverse installation.

0 commit comments

Comments
 (0)