Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https protocol in local nodes per default #1734

Merged
merged 34 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ecfe92d
Change default server url protocol from http to https
Oct 18, 2023
dd8aa24
Update docs about default node url
Oct 18, 2023
5751b84
Change default server url protocol from http to https
Oct 18, 2023
833053b
Update docs about default node url
Oct 18, 2023
9c04977
Merge branch 'use-https-per-default' of https://github.com/HansBambel…
Oct 19, 2023
23b7354
Fix the CI
dadoonet Oct 20, 2023
3f20e3c
Dependabot should propose updates for github actions
dadoonet Oct 20, 2023
bd5bc21
Use a Token instead of password
dadoonet Oct 20, 2023
4d959e5
Try to skip non-needed docker build
dadoonet Oct 20, 2023
7007e22
Revert: Try to skip non-needed docker build
dadoonet Oct 20, 2023
bc26928
Do not specify phases for docker plugin
dadoonet Oct 20, 2023
86374f5
Revert: Do not specify phases for docker plugin and build is finally …
dadoonet Oct 20, 2023
4a69c52
Bump stefanzweifel/git-auto-commit-action from 4 to 5
dependabot[bot] Oct 20, 2023
2d8885f
Bump org.jsoup:jsoup from 1.16.1 to 1.16.2
dependabot[bot] Oct 20, 2023
1c28fe2
Don't hide console logs when running with Docker (#1738)
dadoonet Oct 20, 2023
e76f6c2
Bump org.xerial:sqlite-jdbc from 3.43.2.0 to 3.43.2.1
dependabot[bot] Oct 19, 2023
3cfc954
Bump co.elastic.clients:elasticsearch-java from 8.10.3 to 8.10.4
dependabot[bot] Oct 20, 2023
8fdc728
Automatically update versions
dependabot[bot] Oct 20, 2023
0939650
Update files with EndBug/add-and-commit plugin
dadoonet Oct 20, 2023
a1ced8c
Echo some settings
dadoonet Oct 23, 2023
9d6d308
Revert "Echo some settings"
dadoonet Oct 23, 2023
f0e797a
Skip the update if not a local change for this repo
dadoonet Oct 23, 2023
a3ccda1
Fix build
dadoonet Oct 23, 2023
01bdeeb
Bump tika.version from 2.9.0 to 2.9.1
dependabot[bot] Oct 23, 2023
d000a8d
Automatically update versions
github-actions[bot] Oct 23, 2023
4a0bc37
Bump org.fusesource.jansi:jansi from 2.4.0 to 2.4.1
dependabot[bot] Oct 23, 2023
14775df
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0
dependabot[bot] Oct 23, 2023
bfef041
Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
dependabot[bot] Oct 23, 2023
f5cfbe4
Bump jackson.version from 2.15.2 to 2.15.3
dependabot[bot] Oct 23, 2023
98e5568
Set docker credentials as env variables
dadoonet Oct 23, 2023
0ba811b
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.2 to 3.2.1
dependabot[bot] Oct 24, 2023
975a72e
Bump org.apache.maven.plugins:maven-dependency-plugin
dependabot[bot] Oct 24, 2023
ec6ddf9
Merge branch 'master' into use-https-per-default
dadoonet Nov 24, 2023
a626f0a
Fix unit tests
dadoonet Dec 11, 2023
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
16 changes: 9 additions & 7 deletions docs/source/admin/fs/elasticsearch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,10 @@ Node settings
^^^^^^^^^^^^^

FSCrawler is using elasticsearch REST layer to send data to your
running cluster. By default, it connects to ``http://127.0.0.1:9200``
which is the default when running a local node on your machine.
running cluster. By default, it connects to ``https://127.0.0.1:9200``
which is the default when running a local node on your machine.
Note that using ``https`` requires SSL Configuration set up.
For more information, read :ref:`ssl`.

Of course, in production, you would probably change this and connect to
a production cluster:
Expand All @@ -231,7 +233,7 @@ a production cluster:
name: "test"
elasticsearch:
nodes:
- url: "http://mynode1.mycompany.com:9200"
- url: "https://mynode1.mycompany.com:9200"

If you are using `Elasticsearch service by Elastic <https://www.elastic.co/cloud/elasticsearch-service>`_,
you can just use the ``Cloud ID`` which is available in the Cloud Console and paste it:
Expand All @@ -257,12 +259,12 @@ You can define multiple nodes:
name: "test"
elasticsearch:
nodes:
- url: "http://mynode1.mycompany.com:9200"
- url: "http://mynode2.mycompany.com:9200"
- url: "http://mynode3.mycompany.com:9200"
- url: "https://mynode1.mycompany.com:9200"
- url: "https://mynode2.mycompany.com:9200"
- url: "https://mynode3.mycompany.com:9200"

.. note::
.. versionadded:: 2.2 you can use HTTPS instead of default HTTP.
.. versionadded:: 2.2 you can use HTTPS instead of HTTP.

.. code:: yaml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
public class Elasticsearch {

protected static final Logger logger = LogManager.getLogger(Elasticsearch.class);
public static final ServerUrl NODE_DEFAULT = new ServerUrl("http://127.0.0.1:9200");
public static final ServerUrl NODE_DEFAULT = new ServerUrl("https://127.0.0.1:9200");

private List<ServerUrl> nodes = Collections.singletonList(NODE_DEFAULT);
private String index;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ private void defaultSettingsTester(FsSettings settings) {
assertThat(settings.getElasticsearch().getIndex(), is("test"));
assertThat(settings.getElasticsearch().getIndexFolder(), is("test_folder"));
assertThat(settings.getElasticsearch().getNodes(), iterableWithSize(1));
assertThat(settings.getElasticsearch().getNodes().get(0).getUrl(), is("http://127.0.0.1:9200"));
assertThat(settings.getElasticsearch().getNodes().get(0).getUrl(), is("https://127.0.0.1:9200"));
assertThat(settings.getElasticsearch().getNodes().get(0).getCloudId(), is(nullValue()));
assertThat(settings.getElasticsearch().getNodes().get(0).decodedUrl(), is("http://127.0.0.1:9200"));
assertThat(settings.getElasticsearch().getNodes().get(0).decodedUrl(), is("https://127.0.0.1:9200"));

assertThat(settings.getElasticsearch().getUsername(), is(nullValue()));
assertThat(settings.getElasticsearch().getPassword(), is(nullValue()));
Expand Down
Loading