Skip to content

Commit

Permalink
Update instructions to use ca_trusted_fingerprint
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshdover
joshdover committed Dec 7, 2021
1 parent b742dc0 commit 4adeb34
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 95 deletions.
28 changes: 8 additions & 20 deletions src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,7 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -194,15 +193,13 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -223,8 +220,7 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -235,15 +231,13 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -264,8 +258,7 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -276,15 +269,13 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -308,8 +299,7 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -320,15 +310,13 @@ export const createAuditbeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand Down
28 changes: 8 additions & 20 deletions src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -184,15 +183,13 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -213,8 +210,7 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -225,15 +221,13 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -254,8 +248,7 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -266,15 +259,13 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -298,8 +289,7 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -310,15 +300,13 @@ export const createFilebeatInstructions = (context: TutorialContext) => {
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand Down
14 changes: 4 additions & 10 deletions src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ Kibana index pattern. It is normally safe to omit this command.',
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -153,15 +152,13 @@ Kibana index pattern. It is normally safe to omit this command.',
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand All @@ -188,8 +185,7 @@ Kibana index pattern. It is normally safe to omit this command.',
' username: "elastic"',
' password: "<password>"',
" # If using Elasticsearch's default certificate",
' ssl.ca_sha256: "<es cert fingerprint>"',
' ssl.verification_mode: self_signed_ca',
' ssl.ca_trusted_fingerprint: "<es cert fingerprint>"',
'setup.kibana:',
' host: "<kibana_url>"',
getSpaceIdForBeatsTutorial(context),
Expand All @@ -200,15 +196,13 @@ Kibana index pattern. It is normally safe to omit this command.',
defaultMessage:
'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of \
Elasticsearch, and {kibanaUrlTemplate} is the URL of Kibana. To [configure SSL]({configureSslUrl}) with the \
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate} and set the \
verification mode to {selfSignedCaTemplate}.',
default certificate generated by Elasticsearch, add its fingerprint in {esCertFingerprintTemplate}.',
values: {
passwordTemplate: '`<password>`',
esUrlTemplate: '`<es_url>`',
kibanaUrlTemplate: '`<kibana_url>`',
configureSslUrl: SSL_DOC_URL,
esCertFingerprintTemplate: '`<es cert fingerprint>`',
selfSignedCaTemplate: '`self_signed_ca`',
},
}
),
Expand Down
Loading

0 comments on commit 4adeb34

Please sign in to comment.