Skip to content

Commit

Permalink
Merge #2794 #2802
Browse files Browse the repository at this point in the history
2794: chore(deps): bump camunda-release-parent from 3.0 to 3.7 r=menski a=dependabot-preview[bot]

Bumps [camunda-release-parent](https://github.com/camunda/camunda-release-parent) from 3.0 to 3.7.
<details>
<summary>Commits</summary>

- [`518047a`](camunda/camunda-release-parent@518047a) [maven-release-plugin] prepare release 3.7
- [`10e6bb9`](camunda/camunda-release-parent@10e6bb9) chore(project): remove bpm platform specifics
- [`fffb630`](camunda/camunda-release-parent@fffb630) [maven-release-plugin] prepare for next development iteration
- [`edda7d2`](camunda/camunda-release-parent@edda7d2) [maven-release-plugin] prepare release 3.6
- [`137d4a6`](camunda/camunda-release-parent@137d4a6) chore(licenses): exclude node-modules in license check
- [`7192997`](camunda/camunda-release-parent@7192997) [maven-release-plugin] prepare for next development iteration
- [`c828872`](camunda/camunda-release-parent@c828872) [maven-release-plugin] prepare release 3.5
- [`435ea14`](camunda/camunda-release-parent@435ea14) chore(licenses): add inlineHeader as global propery
- [`46dc44e`](camunda/camunda-release-parent@46dc44e) [maven-release-plugin] prepare for next development iteration
- [`cbc2363`](camunda/camunda-release-parent@cbc2363) [maven-release-plugin] prepare release 3.4
- Additional commits viewable in [compare view](camunda/camunda-release-parent@3.0...3.7)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.camunda:camunda-release-parent&package-manager=maven&previous-version=3.0&new-version=3.7)](https://dependabot.com/compatibility-score.html?dependency-name=org.camunda:camunda-release-parent&package-manager=maven&previous-version=3.0&new-version=3.7)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it). To ignore the version in this PR you can just close it
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

2802: Export error events by default in elasticsearch exporter r=menski a=menski

The export is enabled by default as it is a important record type and should not be missed. Sorry no real test case but I promise I tested it manually.

closes #2773


Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Menski <sebastian.menski@camunda.com>
  • Loading branch information
3 people committed Jul 8, 2019
3 parents d641a70 + 2bc2a8a + e9955a3 commit a0dddbb
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.camunda</groupId>
<artifactId>camunda-release-parent</artifactId>
<version>3.0</version>
<version>3.7</version>
<!-- do not remove empty tag - http://jira.codehaus.org/browse/MNG-4687 -->
<relativePath />
</parent>
Expand Down
1 change: 1 addition & 0 deletions dist/src/main/config/zeebe.cfg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
# rejection = false
#
# deployment = true
# error = true
# incident = true
# job = true
# jobBatch = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ private void createIndexTemplates() {
if (index.deployment) {
createValueIndexTemplate(ValueType.DEPLOYMENT);
}
if (index.error) {
createValueIndexTemplate(ValueType.ERROR);
}
if (index.incident) {
createValueIndexTemplate(ValueType.INCIDENT);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public static class IndexConfiguration {

// value types to export
public boolean deployment = true;
public boolean error = true;
public boolean incident = true;
public boolean job = true;
public boolean jobBatch = false;
Expand All @@ -82,6 +83,8 @@ public String toString() {
+ event
+ ", rejection="
+ rejection
+ ", error="
+ error
+ ", deployment="
+ deployment
+ ", incident="
Expand Down Expand Up @@ -141,6 +144,8 @@ public boolean shouldIndexValueType(ValueType valueType) {
switch (valueType) {
case DEPLOYMENT:
return index.deployment;
case ERROR:
return index.error;
case INCIDENT:
return index.incident;
case JOB:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"index_patterns": [
"zeebe-record-error_*"
],
"order": 20,
"aliases": {
"zeebe-record-error": {}
},
"mappings": {
"_doc": {
"properties": {
"value": {
"dynamic": "strict",
"properties": {
"exceptionMessage": {
"type": "text"
},
"stacktrace": {
"type": "text"
},
"errorEventPosition": {
"type": "long"
},
"workflowInstanceKey": {
"type": "long"
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ protected ElasticsearchExporterConfiguration getDefaultConfiguration() {
configuration.index.event = true;
configuration.index.rejection = true;
configuration.index.deployment = true;
configuration.index.error = true;
configuration.index.incident = true;
configuration.index.job = true;
configuration.index.jobBatch = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
import io.zeebe.protocol.record.Record;
import io.zeebe.protocol.record.RecordType;
import io.zeebe.protocol.record.ValueType;
import io.zeebe.protocol.record.value.ErrorRecordValue;
import io.zeebe.test.exporter.ExporterTestHarness;
import io.zeebe.test.exporter.record.MockRecordValue;
import io.zeebe.util.ZbLogger;
import java.time.Duration;
import java.util.Arrays;
Expand Down Expand Up @@ -69,6 +71,7 @@ public void shouldCreateIndexTemplates() {
config.index.prefix = "foo-bar";
config.index.createTemplate = true;
config.index.deployment = true;
config.index.error = true;
config.index.incident = true;
config.index.job = true;
config.index.jobBatch = true;
Expand All @@ -88,6 +91,7 @@ public void shouldCreateIndexTemplates() {
verify(esClient).putIndexTemplate("foo-bar", ZEEBE_RECORD_TEMPLATE_JSON, "-");

verify(esClient).putIndexTemplate(ValueType.DEPLOYMENT);
verify(esClient).putIndexTemplate(ValueType.ERROR);
verify(esClient).putIndexTemplate(ValueType.INCIDENT);
verify(esClient).putIndexTemplate(ValueType.JOB);
verify(esClient).putIndexTemplate(ValueType.JOB_BATCH);
Expand All @@ -105,6 +109,7 @@ public void shouldExportEnabledValueTypes() {
// given
config.index.event = true;
config.index.deployment = true;
config.index.error = true;
config.index.incident = true;
config.index.job = true;
config.index.jobBatch = true;
Expand All @@ -121,6 +126,7 @@ public void shouldExportEnabledValueTypes() {
final ValueType[] valueTypes =
new ValueType[] {
ValueType.DEPLOYMENT,
ValueType.ERROR,
ValueType.INCIDENT,
ValueType.JOB,
ValueType.JOB_BATCH,
Expand All @@ -144,6 +150,7 @@ public void shouldNotExportDisabledValueTypes() {
// given
config.index.event = true;
config.index.deployment = false;
config.index.error = false;
config.index.incident = false;
config.index.job = false;
config.index.jobBatch = false;
Expand All @@ -160,6 +167,7 @@ public void shouldNotExportDisabledValueTypes() {
final ValueType[] valueTypes =
new ValueType[] {
ValueType.DEPLOYMENT,
ValueType.ERROR,
ValueType.INCIDENT,
ValueType.JOB,
ValueType.JOB_BATCH,
Expand Down Expand Up @@ -332,4 +340,32 @@ private ElasticsearchClient mockElasticsearchClient() {
when(client.putIndexTemplate(anyString(), anyString(), anyString())).thenReturn(true);
return client;
}

static class ErrorMockRecord extends MockRecordValue implements ErrorRecordValue {

static final String EXCEPTION_MESSAGE = "Expected Exception Message";
static final String STACKTRACE = "Expected Stacktrace";
static final long ERROR_EVENT_POSITION = 123;
static final long WORKFLOW_INSTANCE_KEY = 456;

@Override
public String getExceptionMessage() {
return EXCEPTION_MESSAGE;
}

@Override
public String getStacktrace() {
return STACKTRACE;
}

@Override
public long getErrorEventPosition() {
return ERROR_EVENT_POSITION;
}

@Override
public long getWorkflowInstanceKey() {
return WORKFLOW_INSTANCE_KEY;
}
}
}

0 comments on commit a0dddbb

Please sign in to comment.