honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15618 from talevy/rename_pipeline_param 

rename "pipeline_id" param to "pipeline"
This commit is contained in:
Tal Levy 2015-12-22 12:33:42 -08:00
parent 3d0447713c 44d64c8a45
commit fe94593615
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java
View File

@ -50,7 +50,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
public class IngestPlugin extends Plugin { public class IngestPlugin extends Plugin {
public static final String PIPELINE_ID_PARAM_CONTEXT_KEY = "__pipeline_id__"; public static final String PIPELINE_ID_PARAM_CONTEXT_KEY = "__pipeline_id__";
public static final String PIPELINE_ID_PARAM = "pipeline_id"; public static final String PIPELINE_ID_PARAM = "pipeline";
public static final String PIPELINE_ALREADY_PROCESSED = "ingest_already_processed"; public static final String PIPELINE_ALREADY_PROCESSED = "ingest_already_processed";
public static final String NAME = "ingest"; public static final String NAME = "ingest";
public static final String NODE_INGEST_SETTING = "node.ingest"; public static final String NODE_INGEST_SETTING = "node.ingest";

2
plugins/ingest/src/test/resources/rest-api-spec/api/ingest.bulk.json
View File

@ -41,7 +41,7 @@
"type": "list", "type": "list",
"description" : "Default comma-separated list of fields to return in the response for updates" "description" : "Default comma-separated list of fields to return in the response for updates"
}, },
"pipeline_id" : { "pipeline" : {
"type" : "string", "type" : "string",
"description" : "The pipeline id to preprocess incoming documents with" "description" : "The pipeline id to preprocess incoming documents with"
} }

2
plugins/ingest/src/test/resources/rest-api-spec/api/ingest.index.json
View File

@ -66,7 +66,7 @@
"options" : ["internal", "external", "external_gte", "force"], "options" : ["internal", "external", "external_gte", "force"],
"description" : "Specific version type" "description" : "Specific version type"
}, },
"pipeline_id" : { "pipeline" : {
"type" : "string", "type" : "string",
"description" : "The pipeline id to preprocess incoming documents with" "description" : "The pipeline id to preprocess incoming documents with"
} }

6
plugins/ingest/src/test/resources/rest-api-spec/test/ingest/30_grok.yaml
View File

@ -22,7 +22,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "123.42 400 <foo>"} body: {field1: "123.42 400 <foo>"}
- do: - do:
@ -61,7 +61,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "<foo>"} body: {field1: "<foo>"}
- do: - do:
@ -98,7 +98,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "<foo>"} body: {field1: "<foo>"}
- do: - do:

6
plugins/ingest/src/test/resources/rest-api-spec/test/ingest/40_geoip_processor.yaml
View File

@ -21,7 +21,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "128.101.101.101"} body: {field1: "128.101.101.101"}
- do: - do:
@ -65,7 +65,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "128.101.101.101"} body: {field1: "128.101.101.101"}
- do: - do:
@ -110,7 +110,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "128.101.101.101"} body: {field1: "128.101.101.101"}
- do: - do:

2
plugins/ingest/src/test/resources/rest-api-spec/test/ingest/50_date_processor.yaml
View File

@ -24,7 +24,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {date_source_field: "12/06/2010"} body: {date_source_field: "12/06/2010"}
- do: - do:

4
plugins/ingest/src/test/resources/rest-api-spec/test/ingest/60_mutate.yaml
View File

@ -79,7 +79,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: { body: {
field_to_rename: "value", field_to_rename: "value",
field_to_remove: "old_value", field_to_remove: "old_value",
@ -137,7 +137,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field: "value"} body: {field: "value"}
- do: - do:

4
plugins/ingest/src/test/resources/rest-api-spec/test/ingest/80_on_failure.yaml
View File

@ -42,7 +42,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "123.42 400 <foo>"} body: {field1: "123.42 400 <foo>"}
- do: - do:
@ -107,7 +107,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline" pipeline: "my_pipeline"
body: {field1: "123.42 400 <foo>"} body: {field1: "123.42 400 <foo>"}
- do: - do:

8
qa/ingest-with-mustache/src/test/resources/rest-api-spec/test/ingest_mustache/10_pipeline_with_mustache_templates.yaml
View File

@ -32,7 +32,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline_1" pipeline: "my_pipeline_1"
body: {} body: {}
- do: - do:
@ -112,7 +112,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline_1" pipeline: "my_pipeline_1"
body: { body: {
metadata: "0", metadata: "0",
field1: "1", field1: "1",
@ -137,7 +137,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline_2" pipeline: "my_pipeline_2"
body: { body: {
field1: "field2" field1: "field2"
} }
@ -156,7 +156,7 @@
index: test index: test
type: test type: test
id: 1 id: 1
pipeline_id: "my_pipeline_3" pipeline: "my_pipeline_3"
body: { body: {
field_to_remove: "field2", field_to_remove: "field2",
field2: "2", field2: "2",