From 269c0fc96a7a1535e88479eaa814ea5a45c188a1 Mon Sep 17 00:00:00 2001 From: Tomas Della Vedova Date: Fri, 3 May 2019 17:23:40 +0200 Subject: [PATCH] Improve observability (#834) * API generation * Added correlation id support * Updated docs * Updated test * Updated code generation * API generation * Updated code generation * Added support for client name and custom context object * Updated docs * Updated test * Fix docs * Updated docs * Added id support also for sniffing * Updated test * Update docs/observability.asciidoc Co-Authored-By: delvedor * Update docs/observability.asciidoc Co-Authored-By: delvedor * Apply suggestions * Update docs/configuration.asciidoc Co-Authored-By: delvedor * Update docs/configuration.asciidoc Co-Authored-By: delvedor * Update docs/observability.asciidoc Co-Authored-By: delvedor * Update docs/observability.asciidoc Co-Authored-By: delvedor * Update docs/observability.asciidoc Co-Authored-By: delvedor * Apply suggestions * Updated README.md * Fixed test * Addressed suggestions --- README.md | 8 +- api/api/bulk.js | 2 + api/api/cat.aliases.js | 2 + api/api/cat.allocation.js | 2 + api/api/cat.count.js | 2 + api/api/cat.fielddata.js | 2 + api/api/cat.health.js | 2 + api/api/cat.help.js | 2 + api/api/cat.indices.js | 2 + api/api/cat.master.js | 2 + api/api/cat.nodeattrs.js | 2 + api/api/cat.nodes.js | 2 + api/api/cat.pending_tasks.js | 2 + api/api/cat.plugins.js | 2 + api/api/cat.recovery.js | 2 + api/api/cat.repositories.js | 2 + api/api/cat.segments.js | 2 + api/api/cat.shards.js | 2 + api/api/cat.snapshots.js | 2 + api/api/cat.tasks.js | 2 + api/api/cat.templates.js | 2 + api/api/cat.thread_pool.js | 2 + api/api/ccr.delete_auto_follow_pattern.js | 2 + api/api/ccr.follow.js | 2 + api/api/ccr.follow_info.js | 2 + api/api/ccr.follow_stats.js | 2 + api/api/ccr.forget_follower.js | 2 + api/api/ccr.get_auto_follow_pattern.js | 2 + api/api/ccr.pause_follow.js | 2 + api/api/ccr.put_auto_follow_pattern.js | 2 + api/api/ccr.resume_follow.js | 2 + api/api/ccr.stats.js | 2 + api/api/ccr.unfollow.js | 2 + api/api/clear_scroll.js | 2 + api/api/cluster.allocation_explain.js | 2 + api/api/cluster.get_settings.js | 2 + api/api/cluster.health.js | 2 + api/api/cluster.pending_tasks.js | 2 + api/api/cluster.put_settings.js | 2 + api/api/cluster.remote_info.js | 2 + api/api/cluster.reroute.js | 2 + api/api/cluster.state.js | 2 + api/api/cluster.stats.js | 2 + api/api/count.js | 2 + api/api/create.js | 2 + .../data_frame.delete_data_frame_transform.js | 2 + .../data_frame.get_data_frame_transform.js | 2 + ...ta_frame.get_data_frame_transform_stats.js | 2 + ...data_frame.preview_data_frame_transform.js | 2 + .../data_frame.put_data_frame_transform.js | 2 + .../data_frame.start_data_frame_transform.js | 2 + .../data_frame.stop_data_frame_transform.js | 2 + api/api/delete.js | 2 + api/api/delete_by_query.js | 2 + api/api/delete_by_query_rethrottle.js | 2 + api/api/delete_script.js | 2 + api/api/exists.js | 2 + api/api/exists_source.js | 2 + api/api/explain.js | 2 + api/api/field_caps.js | 2 + api/api/get.js | 2 + api/api/get_script.js | 2 + api/api/get_source.js | 2 + api/api/graph.explore.js | 2 + api/api/ilm.delete_lifecycle.js | 2 + api/api/ilm.explain_lifecycle.js | 2 + api/api/ilm.get_lifecycle.js | 2 + api/api/ilm.get_status.js | 2 + api/api/ilm.move_to_step.js | 2 + api/api/ilm.put_lifecycle.js | 2 + api/api/ilm.remove_policy.js | 2 + api/api/ilm.retry.js | 2 + api/api/ilm.start.js | 2 + api/api/ilm.stop.js | 2 + api/api/index.js | 2 + api/api/indices.analyze.js | 2 + api/api/indices.clear_cache.js | 2 + api/api/indices.close.js | 2 + api/api/indices.create.js | 2 + api/api/indices.delete.js | 2 + api/api/indices.delete_alias.js | 2 + api/api/indices.delete_template.js | 2 + api/api/indices.exists.js | 2 + api/api/indices.exists_alias.js | 2 + api/api/indices.exists_template.js | 2 + api/api/indices.exists_type.js | 2 + api/api/indices.flush.js | 2 + api/api/indices.flush_synced.js | 2 + api/api/indices.forcemerge.js | 2 + api/api/indices.freeze.js | 2 + api/api/indices.get.js | 2 + api/api/indices.get_alias.js | 2 + api/api/indices.get_field_mapping.js | 2 + api/api/indices.get_mapping.js | 2 + api/api/indices.get_settings.js | 2 + api/api/indices.get_template.js | 2 + api/api/indices.get_upgrade.js | 2 + api/api/indices.open.js | 2 + api/api/indices.put_alias.js | 2 + api/api/indices.put_mapping.js | 2 + api/api/indices.put_settings.js | 2 + api/api/indices.put_template.js | 2 + api/api/indices.recovery.js | 2 + api/api/indices.refresh.js | 2 + api/api/indices.rollover.js | 2 + api/api/indices.segments.js | 2 + api/api/indices.shard_stores.js | 2 + api/api/indices.shrink.js | 2 + api/api/indices.split.js | 2 + api/api/indices.stats.js | 2 + api/api/indices.unfreeze.js | 2 + api/api/indices.update_aliases.js | 2 + api/api/indices.upgrade.js | 2 + api/api/indices.validate_query.js | 2 + api/api/info.js | 2 + api/api/ingest.delete_pipeline.js | 2 + api/api/ingest.get_pipeline.js | 2 + api/api/ingest.processor_grok.js | 2 + api/api/ingest.put_pipeline.js | 2 + api/api/ingest.simulate.js | 2 + api/api/license.delete.js | 2 + api/api/license.get.js | 2 + api/api/license.get_basic_status.js | 2 + api/api/license.get_trial_status.js | 2 + api/api/license.post.js | 2 + api/api/license.post_start_basic.js | 2 + api/api/license.post_start_trial.js | 2 + api/api/mget.js | 2 + api/api/migration.deprecations.js | 2 + api/api/ml.close_job.js | 2 + api/api/ml.delete_calendar.js | 2 + api/api/ml.delete_calendar_event.js | 2 + api/api/ml.delete_calendar_job.js | 2 + api/api/ml.delete_datafeed.js | 2 + api/api/ml.delete_expired_data.js | 2 + api/api/ml.delete_filter.js | 2 + api/api/ml.delete_forecast.js | 2 + api/api/ml.delete_job.js | 2 + api/api/ml.delete_model_snapshot.js | 2 + api/api/ml.find_file_structure.js | 2 + api/api/ml.flush_job.js | 2 + api/api/ml.forecast.js | 2 + api/api/ml.get_buckets.js | 2 + api/api/ml.get_calendar_events.js | 2 + api/api/ml.get_calendars.js | 2 + api/api/ml.get_categories.js | 2 + api/api/ml.get_datafeed_stats.js | 2 + api/api/ml.get_datafeeds.js | 2 + api/api/ml.get_filters.js | 2 + api/api/ml.get_influencers.js | 2 + api/api/ml.get_job_stats.js | 2 + api/api/ml.get_jobs.js | 2 + api/api/ml.get_model_snapshots.js | 2 + api/api/ml.get_overall_buckets.js | 2 + api/api/ml.get_records.js | 2 + api/api/ml.info.js | 2 + api/api/ml.open_job.js | 2 + api/api/ml.post_calendar_events.js | 2 + api/api/ml.post_data.js | 2 + api/api/ml.preview_datafeed.js | 2 + api/api/ml.put_calendar.js | 2 + api/api/ml.put_calendar_job.js | 2 + api/api/ml.put_datafeed.js | 2 + api/api/ml.put_filter.js | 2 + api/api/ml.put_job.js | 2 + api/api/ml.revert_model_snapshot.js | 2 + api/api/ml.set_upgrade_mode.js | 2 + api/api/ml.start_datafeed.js | 2 + api/api/ml.stop_datafeed.js | 2 + api/api/ml.update_datafeed.js | 2 + api/api/ml.update_filter.js | 2 + api/api/ml.update_job.js | 2 + api/api/ml.update_model_snapshot.js | 2 + api/api/ml.validate.js | 2 + api/api/ml.validate_detector.js | 2 + api/api/monitoring.bulk.js | 2 + api/api/msearch.js | 2 + api/api/msearch_template.js | 2 + api/api/mtermvectors.js | 2 + api/api/nodes.hot_threads.js | 2 + api/api/nodes.info.js | 2 + api/api/nodes.reload_secure_settings.js | 2 + api/api/nodes.stats.js | 2 + api/api/nodes.usage.js | 2 + api/api/ping.js | 2 + api/api/put_script.js | 2 + api/api/rank_eval.js | 2 + api/api/reindex.js | 2 + api/api/reindex_rethrottle.js | 2 + api/api/render_search_template.js | 2 + api/api/rollup.delete_job.js | 2 + api/api/rollup.get_jobs.js | 2 + api/api/rollup.get_rollup_caps.js | 2 + api/api/rollup.get_rollup_index_caps.js | 2 + api/api/rollup.put_job.js | 2 + api/api/rollup.rollup_search.js | 2 + api/api/rollup.start_job.js | 2 + api/api/rollup.stop_job.js | 2 + api/api/scripts_painless_context.js | 2 + api/api/scripts_painless_execute.js | 2 + api/api/scroll.js | 2 + api/api/search.js | 2 + api/api/search_shards.js | 2 + api/api/search_template.js | 2 + api/api/security.authenticate.js | 2 + api/api/security.change_password.js | 2 + api/api/security.clear_cached_realms.js | 2 + api/api/security.clear_cached_roles.js | 2 + api/api/security.create_api_key.js | 2 + api/api/security.delete_privileges.js | 2 + api/api/security.delete_role.js | 2 + api/api/security.delete_role_mapping.js | 2 + api/api/security.delete_user.js | 2 + api/api/security.disable_user.js | 2 + api/api/security.enable_user.js | 2 + api/api/security.get_api_key.js | 2 + api/api/security.get_privileges.js | 2 + api/api/security.get_role.js | 2 + api/api/security.get_role_mapping.js | 2 + api/api/security.get_token.js | 2 + api/api/security.get_user.js | 2 + api/api/security.get_user_privileges.js | 2 + api/api/security.has_privileges.js | 2 + api/api/security.invalidate_api_key.js | 2 + api/api/security.invalidate_token.js | 2 + api/api/security.put_privileges.js | 2 + api/api/security.put_role.js | 2 + api/api/security.put_role_mapping.js | 2 + api/api/security.put_user.js | 2 + api/api/snapshot.create.js | 2 + api/api/snapshot.create_repository.js | 2 + api/api/snapshot.delete.js | 2 + api/api/snapshot.delete_repository.js | 2 + api/api/snapshot.get.js | 2 + api/api/snapshot.get_repository.js | 2 + api/api/snapshot.restore.js | 2 + api/api/snapshot.status.js | 2 + api/api/snapshot.verify_repository.js | 2 + api/api/sql.clear_cursor.js | 2 + api/api/sql.query.js | 2 + api/api/sql.translate.js | 2 + api/api/ssl.certificates.js | 2 + api/api/tasks.cancel.js | 2 + api/api/tasks.get.js | 2 + api/api/tasks.list.js | 2 + api/api/termvectors.js | 2 + api/api/update.js | 2 + api/api/update_by_query.js | 2 + api/api/update_by_query_rethrottle.js | 2 + api/api/watcher.ack_watch.js | 2 + api/api/watcher.activate_watch.js | 2 + api/api/watcher.deactivate_watch.js | 2 + api/api/watcher.delete_watch.js | 2 + api/api/watcher.execute_watch.js | 2 + api/api/watcher.get_watch.js | 2 + api/api/watcher.put_watch.js | 2 + api/api/watcher.start.js | 2 + api/api/watcher.stats.js | 2 + api/api/watcher.stop.js | 2 + api/api/xpack.info.js | 2 + api/api/xpack.usage.js | 2 + docs/configuration.asciidoc | 19 +- docs/index.asciidoc | 1 + docs/observability.asciidoc | 250 +++++++++++++ docs/usage.asciidoc | 108 +----- index.d.ts | 3 + index.js | 9 +- lib/ConnectionPool.d.ts | 14 +- lib/ConnectionPool.js | 22 +- lib/Transport.d.ts | 28 +- lib/Transport.js | 43 ++- scripts/utils/generateApis.js | 2 + test/behavior/observability.test.js | 334 ++++++++++++++++++ test/behavior/resurrect.test.js | 13 +- test/unit/child.test.js | 69 ++++ test/unit/connection-pool.test.js | 28 +- test/unit/events.test.js | 15 +- test/unit/transport.test.js | 36 +- test/utils/MockConnection.js | 48 ++- 279 files changed, 1428 insertions(+), 142 deletions(-) create mode 100644 docs/observability.asciidoc create mode 100644 test/behavior/observability.test.js diff --git a/README.md b/README.md index 78b153f96..5d707fb60 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,10 @@ The client is designed to be easily configured as you see fit for your needs, fo nodeFilter: nodeFilterFn; // custom selection strategy, defaults `round-robin` nodeSelector: nodeSelectorFn | string; + // function to generate the request id for every request + generateRequestId: generateRequestIdFn; + // name to identify the client instance in the events + name: string; } ``` @@ -143,7 +147,9 @@ The supported *request specific options* are: asStream: boolean, // default `false` compression: string, // default `false` headers: object, // default `null` - querystring: object // default `null` + querystring: object // default `null`, + context: object // default `null`, + id: any // default incr. integer } ``` diff --git a/api/api/bulk.js b/api/api/bulk.js index 5322898dc..15b660683 100644 --- a/api/api/bulk.js +++ b/api/api/bulk.js @@ -136,6 +136,8 @@ function buildBulk (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.aliases.js b/api/api/cat.aliases.js index e5738e038..2b7ef3bc3 100644 --- a/api/api/cat.aliases.js +++ b/api/api/cat.aliases.js @@ -120,6 +120,8 @@ function buildCatAliases (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.allocation.js b/api/api/cat.allocation.js index 561c02ddb..f7118efea 100644 --- a/api/api/cat.allocation.js +++ b/api/api/cat.allocation.js @@ -122,6 +122,8 @@ function buildCatAllocation (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.count.js b/api/api/cat.count.js index 2be151d71..cdb1c2ccd 100644 --- a/api/api/cat.count.js +++ b/api/api/cat.count.js @@ -120,6 +120,8 @@ function buildCatCount (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.fielddata.js b/api/api/cat.fielddata.js index 1685acd80..d1e22cf0a 100644 --- a/api/api/cat.fielddata.js +++ b/api/api/cat.fielddata.js @@ -124,6 +124,8 @@ function buildCatFielddata (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.health.js b/api/api/cat.health.js index 6badc3a80..827ebd276 100644 --- a/api/api/cat.health.js +++ b/api/api/cat.health.js @@ -117,6 +117,8 @@ function buildCatHealth (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.help.js b/api/api/cat.help.js index d776803de..2f744f49d 100644 --- a/api/api/cat.help.js +++ b/api/api/cat.help.js @@ -104,6 +104,8 @@ function buildCatHelp (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.indices.js b/api/api/cat.indices.js index f3469eb26..d731c372a 100644 --- a/api/api/cat.indices.js +++ b/api/api/cat.indices.js @@ -129,6 +129,8 @@ function buildCatIndices (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.master.js b/api/api/cat.master.js index 08528e146..6ea1ef531 100644 --- a/api/api/cat.master.js +++ b/api/api/cat.master.js @@ -115,6 +115,8 @@ function buildCatMaster (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.nodeattrs.js b/api/api/cat.nodeattrs.js index 65a36356a..66995d45c 100644 --- a/api/api/cat.nodeattrs.js +++ b/api/api/cat.nodeattrs.js @@ -115,6 +115,8 @@ function buildCatNodeattrs (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.nodes.js b/api/api/cat.nodes.js index d539438c5..21f27a517 100644 --- a/api/api/cat.nodes.js +++ b/api/api/cat.nodes.js @@ -118,6 +118,8 @@ function buildCatNodes (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.pending_tasks.js b/api/api/cat.pending_tasks.js index b13a3d306..920a77e47 100644 --- a/api/api/cat.pending_tasks.js +++ b/api/api/cat.pending_tasks.js @@ -115,6 +115,8 @@ function buildCatPendingTasks (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.plugins.js b/api/api/cat.plugins.js index 1f3b6cdf3..e254ddb3b 100644 --- a/api/api/cat.plugins.js +++ b/api/api/cat.plugins.js @@ -115,6 +115,8 @@ function buildCatPlugins (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.recovery.js b/api/api/cat.recovery.js index 7e631fab3..27938674a 100644 --- a/api/api/cat.recovery.js +++ b/api/api/cat.recovery.js @@ -120,6 +120,8 @@ function buildCatRecovery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.repositories.js b/api/api/cat.repositories.js index 9e229bfd8..d4801efc9 100644 --- a/api/api/cat.repositories.js +++ b/api/api/cat.repositories.js @@ -115,6 +115,8 @@ function buildCatRepositories (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.segments.js b/api/api/cat.segments.js index adc48ee61..9e2415c34 100644 --- a/api/api/cat.segments.js +++ b/api/api/cat.segments.js @@ -117,6 +117,8 @@ function buildCatSegments (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.shards.js b/api/api/cat.shards.js index 4de59a7c9..15031236f 100644 --- a/api/api/cat.shards.js +++ b/api/api/cat.shards.js @@ -122,6 +122,8 @@ function buildCatShards (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.snapshots.js b/api/api/cat.snapshots.js index 4db252fe9..94ead6ac4 100644 --- a/api/api/cat.snapshots.js +++ b/api/api/cat.snapshots.js @@ -121,6 +121,8 @@ function buildCatSnapshots (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.tasks.js b/api/api/cat.tasks.js index b00e20496..e478ccc7e 100644 --- a/api/api/cat.tasks.js +++ b/api/api/cat.tasks.js @@ -120,6 +120,8 @@ function buildCatTasks (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.templates.js b/api/api/cat.templates.js index 2f0b6beca..432e1d28d 100644 --- a/api/api/cat.templates.js +++ b/api/api/cat.templates.js @@ -120,6 +120,8 @@ function buildCatTemplates (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cat.thread_pool.js b/api/api/cat.thread_pool.js index fddeb9256..49d7078f8 100644 --- a/api/api/cat.thread_pool.js +++ b/api/api/cat.thread_pool.js @@ -122,6 +122,8 @@ function buildCatThreadPool (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.delete_auto_follow_pattern.js b/api/api/ccr.delete_auto_follow_pattern.js index af0f01987..f5241c473 100644 --- a/api/api/ccr.delete_auto_follow_pattern.js +++ b/api/api/ccr.delete_auto_follow_pattern.js @@ -96,6 +96,8 @@ function buildCcrDeleteAutoFollowPattern (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.follow.js b/api/api/ccr.follow.js index ab8d8e255..9ee3158c6 100644 --- a/api/api/ccr.follow.js +++ b/api/api/ccr.follow.js @@ -102,6 +102,8 @@ function buildCcrFollow (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.follow_info.js b/api/api/ccr.follow_info.js index 209521757..1e8040461 100644 --- a/api/api/ccr.follow_info.js +++ b/api/api/ccr.follow_info.js @@ -90,6 +90,8 @@ function buildCcrFollowInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.follow_stats.js b/api/api/ccr.follow_stats.js index 5d455b480..52373f123 100644 --- a/api/api/ccr.follow_stats.js +++ b/api/api/ccr.follow_stats.js @@ -96,6 +96,8 @@ function buildCcrFollowStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.forget_follower.js b/api/api/ccr.forget_follower.js index 1e2504cee..db17668a5 100644 --- a/api/api/ccr.forget_follower.js +++ b/api/api/ccr.forget_follower.js @@ -101,6 +101,8 @@ function buildCcrForgetFollower (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.get_auto_follow_pattern.js b/api/api/ccr.get_auto_follow_pattern.js index 83b3cbfc8..577e229ac 100644 --- a/api/api/ccr.get_auto_follow_pattern.js +++ b/api/api/ccr.get_auto_follow_pattern.js @@ -94,6 +94,8 @@ function buildCcrGetAutoFollowPattern (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.pause_follow.js b/api/api/ccr.pause_follow.js index 2862163f1..462e30be4 100644 --- a/api/api/ccr.pause_follow.js +++ b/api/api/ccr.pause_follow.js @@ -96,6 +96,8 @@ function buildCcrPauseFollow (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.put_auto_follow_pattern.js b/api/api/ccr.put_auto_follow_pattern.js index 6338da352..0f2691714 100644 --- a/api/api/ccr.put_auto_follow_pattern.js +++ b/api/api/ccr.put_auto_follow_pattern.js @@ -101,6 +101,8 @@ function buildCcrPutAutoFollowPattern (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.resume_follow.js b/api/api/ccr.resume_follow.js index 3c857a84a..36c666531 100644 --- a/api/api/ccr.resume_follow.js +++ b/api/api/ccr.resume_follow.js @@ -97,6 +97,8 @@ function buildCcrResumeFollow (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.stats.js b/api/api/ccr.stats.js index 81f544210..3f1d9bc39 100644 --- a/api/api/ccr.stats.js +++ b/api/api/ccr.stats.js @@ -89,6 +89,8 @@ function buildCcrStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ccr.unfollow.js b/api/api/ccr.unfollow.js index 2163e6ad7..43c1ba4b1 100644 --- a/api/api/ccr.unfollow.js +++ b/api/api/ccr.unfollow.js @@ -96,6 +96,8 @@ function buildCcrUnfollow (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/clear_scroll.js b/api/api/clear_scroll.js index 552ac23cc..8f17c4dc3 100644 --- a/api/api/clear_scroll.js +++ b/api/api/clear_scroll.js @@ -100,6 +100,8 @@ function buildClearScroll (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.allocation_explain.js b/api/api/cluster.allocation_explain.js index 3ce754e73..4e7155e30 100644 --- a/api/api/cluster.allocation_explain.js +++ b/api/api/cluster.allocation_explain.js @@ -101,6 +101,8 @@ function buildClusterAllocationExplain (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.get_settings.js b/api/api/cluster.get_settings.js index 8e215e750..f9722e0b9 100644 --- a/api/api/cluster.get_settings.js +++ b/api/api/cluster.get_settings.js @@ -111,6 +111,8 @@ function buildClusterGetSettings (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.health.js b/api/api/cluster.health.js index 0127efecb..9c764b9fe 100644 --- a/api/api/cluster.health.js +++ b/api/api/cluster.health.js @@ -135,6 +135,8 @@ function buildClusterHealth (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.pending_tasks.js b/api/api/cluster.pending_tasks.js index cc132b7a7..32802c975 100644 --- a/api/api/cluster.pending_tasks.js +++ b/api/api/cluster.pending_tasks.js @@ -105,6 +105,8 @@ function buildClusterPendingTasks (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.put_settings.js b/api/api/cluster.put_settings.js index 9064e1670..230714ce7 100644 --- a/api/api/cluster.put_settings.js +++ b/api/api/cluster.put_settings.js @@ -109,6 +109,8 @@ function buildClusterPutSettings (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.remote_info.js b/api/api/cluster.remote_info.js index 22a2ca142..62122e6ac 100644 --- a/api/api/cluster.remote_info.js +++ b/api/api/cluster.remote_info.js @@ -100,6 +100,8 @@ function buildClusterRemoteInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.reroute.js b/api/api/cluster.reroute.js index 5a29ea54d..9173b8b36 100644 --- a/api/api/cluster.reroute.js +++ b/api/api/cluster.reroute.js @@ -110,6 +110,8 @@ function buildClusterReroute (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.state.js b/api/api/cluster.state.js index 7d6b7c303..002097761 100644 --- a/api/api/cluster.state.js +++ b/api/api/cluster.state.js @@ -137,6 +137,8 @@ function buildClusterState (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/cluster.stats.js b/api/api/cluster.stats.js index 77f634146..b57e67c56 100644 --- a/api/api/cluster.stats.js +++ b/api/api/cluster.stats.js @@ -110,6 +110,8 @@ function buildClusterStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/count.js b/api/api/count.js index ae6816fba..ac504f2e5 100644 --- a/api/api/count.js +++ b/api/api/count.js @@ -145,6 +145,8 @@ function buildCount (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/create.js b/api/api/create.js index 0ee306e57..3e14db497 100644 --- a/api/api/create.js +++ b/api/api/create.js @@ -134,6 +134,8 @@ function buildCreate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.delete_data_frame_transform.js b/api/api/data_frame.delete_data_frame_transform.js index 6d4656451..469f2c6d9 100644 --- a/api/api/data_frame.delete_data_frame_transform.js +++ b/api/api/data_frame.delete_data_frame_transform.js @@ -100,6 +100,8 @@ function buildDataFrameDeleteDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.get_data_frame_transform.js b/api/api/data_frame.get_data_frame_transform.js index a54947560..7c58b2a92 100644 --- a/api/api/data_frame.get_data_frame_transform.js +++ b/api/api/data_frame.get_data_frame_transform.js @@ -103,6 +103,8 @@ function buildDataFrameGetDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.get_data_frame_transform_stats.js b/api/api/data_frame.get_data_frame_transform_stats.js index 730085eeb..40264ccd5 100644 --- a/api/api/data_frame.get_data_frame_transform_stats.js +++ b/api/api/data_frame.get_data_frame_transform_stats.js @@ -99,6 +99,8 @@ function buildDataFrameGetDataFrameTransformStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.preview_data_frame_transform.js b/api/api/data_frame.preview_data_frame_transform.js index 761c8ad2f..85bd668a0 100644 --- a/api/api/data_frame.preview_data_frame_transform.js +++ b/api/api/data_frame.preview_data_frame_transform.js @@ -96,6 +96,8 @@ function buildDataFramePreviewDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.put_data_frame_transform.js b/api/api/data_frame.put_data_frame_transform.js index a7e29105b..9514f7895 100644 --- a/api/api/data_frame.put_data_frame_transform.js +++ b/api/api/data_frame.put_data_frame_transform.js @@ -101,6 +101,8 @@ function buildDataFramePutDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.start_data_frame_transform.js b/api/api/data_frame.start_data_frame_transform.js index b75264fda..6f2218cca 100644 --- a/api/api/data_frame.start_data_frame_transform.js +++ b/api/api/data_frame.start_data_frame_transform.js @@ -101,6 +101,8 @@ function buildDataFrameStartDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/data_frame.stop_data_frame_transform.js b/api/api/data_frame.stop_data_frame_transform.js index 2ae878753..be3919984 100644 --- a/api/api/data_frame.stop_data_frame_transform.js +++ b/api/api/data_frame.stop_data_frame_transform.js @@ -104,6 +104,8 @@ function buildDataFrameStopDataFrameTransform (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/delete.js b/api/api/delete.js index 6f835dcc8..727747be5 100644 --- a/api/api/delete.js +++ b/api/api/delete.js @@ -137,6 +137,8 @@ function buildDelete (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/delete_by_query.js b/api/api/delete_by_query.js index 7e3aae9ea..2b95a02e6 100644 --- a/api/api/delete_by_query.js +++ b/api/api/delete_by_query.js @@ -196,6 +196,8 @@ function buildDeleteByQuery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/delete_by_query_rethrottle.js b/api/api/delete_by_query_rethrottle.js index bbeb5094a..8cc90e6ab 100644 --- a/api/api/delete_by_query_rethrottle.js +++ b/api/api/delete_by_query_rethrottle.js @@ -112,6 +112,8 @@ function buildDeleteByQueryRethrottle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/delete_script.js b/api/api/delete_script.js index 6165361bf..9ab6c4460 100644 --- a/api/api/delete_script.js +++ b/api/api/delete_script.js @@ -110,6 +110,8 @@ function buildDeleteScript (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/exists.js b/api/api/exists.js index ac6e5db8a..0bc2eead2 100644 --- a/api/api/exists.js +++ b/api/api/exists.js @@ -141,6 +141,8 @@ function buildExists (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/exists_source.js b/api/api/exists_source.js index d8111530e..7309e7a9d 100644 --- a/api/api/exists_source.js +++ b/api/api/exists_source.js @@ -147,6 +147,8 @@ function buildExistsSource (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/explain.js b/api/api/explain.js index f59f7a11c..26482fa00 100644 --- a/api/api/explain.js +++ b/api/api/explain.js @@ -143,6 +143,8 @@ function buildExplain (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/field_caps.js b/api/api/field_caps.js index 46ba81f07..1771404cd 100644 --- a/api/api/field_caps.js +++ b/api/api/field_caps.js @@ -119,6 +119,8 @@ function buildFieldCaps (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/get.js b/api/api/get.js index b9a5c192e..923732178 100644 --- a/api/api/get.js +++ b/api/api/get.js @@ -141,6 +141,8 @@ function buildGet (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/get_script.js b/api/api/get_script.js index b6659841f..aae577d34 100644 --- a/api/api/get_script.js +++ b/api/api/get_script.js @@ -108,6 +108,8 @@ function buildGetScript (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/get_source.js b/api/api/get_source.js index bcac14deb..88bab3b77 100644 --- a/api/api/get_source.js +++ b/api/api/get_source.js @@ -138,6 +138,8 @@ function buildGetSource (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/graph.explore.js b/api/api/graph.explore.js index 19e601a64..44da987fb 100644 --- a/api/api/graph.explore.js +++ b/api/api/graph.explore.js @@ -105,6 +105,8 @@ function buildGraphExplore (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.delete_lifecycle.js b/api/api/ilm.delete_lifecycle.js index 7e09289af..57ced77cc 100644 --- a/api/api/ilm.delete_lifecycle.js +++ b/api/api/ilm.delete_lifecycle.js @@ -96,6 +96,8 @@ function buildIlmDeleteLifecycle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.explain_lifecycle.js b/api/api/ilm.explain_lifecycle.js index e5638c16d..62362c7ec 100644 --- a/api/api/ilm.explain_lifecycle.js +++ b/api/api/ilm.explain_lifecycle.js @@ -96,6 +96,8 @@ function buildIlmExplainLifecycle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.get_lifecycle.js b/api/api/ilm.get_lifecycle.js index a01952fa5..1145c399a 100644 --- a/api/api/ilm.get_lifecycle.js +++ b/api/api/ilm.get_lifecycle.js @@ -100,6 +100,8 @@ function buildIlmGetLifecycle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.get_status.js b/api/api/ilm.get_status.js index 30c135900..f27b964e3 100644 --- a/api/api/ilm.get_status.js +++ b/api/api/ilm.get_status.js @@ -95,6 +95,8 @@ function buildIlmGetStatus (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.move_to_step.js b/api/api/ilm.move_to_step.js index 49f82a8c5..c450a083a 100644 --- a/api/api/ilm.move_to_step.js +++ b/api/api/ilm.move_to_step.js @@ -91,6 +91,8 @@ function buildIlmMoveToStep (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.put_lifecycle.js b/api/api/ilm.put_lifecycle.js index 28955b0fe..b8d58d5f3 100644 --- a/api/api/ilm.put_lifecycle.js +++ b/api/api/ilm.put_lifecycle.js @@ -91,6 +91,8 @@ function buildIlmPutLifecycle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.remove_policy.js b/api/api/ilm.remove_policy.js index ccfbc8c81..ca37399d2 100644 --- a/api/api/ilm.remove_policy.js +++ b/api/api/ilm.remove_policy.js @@ -96,6 +96,8 @@ function buildIlmRemovePolicy (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.retry.js b/api/api/ilm.retry.js index 5ea000327..1fbcdd1da 100644 --- a/api/api/ilm.retry.js +++ b/api/api/ilm.retry.js @@ -96,6 +96,8 @@ function buildIlmRetry (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.start.js b/api/api/ilm.start.js index f2461f3ef..8c907d91d 100644 --- a/api/api/ilm.start.js +++ b/api/api/ilm.start.js @@ -95,6 +95,8 @@ function buildIlmStart (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ilm.stop.js b/api/api/ilm.stop.js index ad1607579..b056fa599 100644 --- a/api/api/ilm.stop.js +++ b/api/api/ilm.stop.js @@ -95,6 +95,8 @@ function buildIlmStop (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/index.js b/api/api/index.js index 07e1a09c3..508e1f6cf 100644 --- a/api/api/index.js +++ b/api/api/index.js @@ -143,6 +143,8 @@ function buildIndex (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.analyze.js b/api/api/indices.analyze.js index 4d819f7c0..a9d6e886f 100644 --- a/api/api/indices.analyze.js +++ b/api/api/indices.analyze.js @@ -102,6 +102,8 @@ function buildIndicesAnalyze (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.clear_cache.js b/api/api/indices.clear_cache.js index fa2739c6b..629b97f2b 100644 --- a/api/api/indices.clear_cache.js +++ b/api/api/indices.clear_cache.js @@ -124,6 +124,8 @@ function buildIndicesClearCache (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.close.js b/api/api/indices.close.js index a19790e32..cdfefec47 100644 --- a/api/api/indices.close.js +++ b/api/api/indices.close.js @@ -122,6 +122,8 @@ function buildIndicesClose (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.create.js b/api/api/indices.create.js index 355a7a370..61933d059 100644 --- a/api/api/indices.create.js +++ b/api/api/indices.create.js @@ -113,6 +113,8 @@ function buildIndicesCreate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.delete.js b/api/api/indices.delete.js index bb46902fd..ced4e48e2 100644 --- a/api/api/indices.delete.js +++ b/api/api/indices.delete.js @@ -119,6 +119,8 @@ function buildIndicesDelete (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.delete_alias.js b/api/api/indices.delete_alias.js index db5091854..f7f37523d 100644 --- a/api/api/indices.delete_alias.js +++ b/api/api/indices.delete_alias.js @@ -125,6 +125,8 @@ function buildIndicesDeleteAlias (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.delete_template.js b/api/api/indices.delete_template.js index 623ba6933..4f969efe0 100644 --- a/api/api/indices.delete_template.js +++ b/api/api/indices.delete_template.js @@ -110,6 +110,8 @@ function buildIndicesDeleteTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.exists.js b/api/api/indices.exists.js index 85cc737a4..629725623 100644 --- a/api/api/indices.exists.js +++ b/api/api/indices.exists.js @@ -122,6 +122,8 @@ function buildIndicesExists (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.exists_alias.js b/api/api/indices.exists_alias.js index d25ddb733..7531e6fb0 100644 --- a/api/api/indices.exists_alias.js +++ b/api/api/indices.exists_alias.js @@ -121,6 +121,8 @@ function buildIndicesExistsAlias (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.exists_template.js b/api/api/indices.exists_template.js index ea3fb9d35..83273b91d 100644 --- a/api/api/indices.exists_template.js +++ b/api/api/indices.exists_template.js @@ -113,6 +113,8 @@ function buildIndicesExistsTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.exists_type.js b/api/api/indices.exists_type.js index 4c2573419..585c2d325 100644 --- a/api/api/indices.exists_type.js +++ b/api/api/indices.exists_type.js @@ -127,6 +127,8 @@ function buildIndicesExistsType (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.flush.js b/api/api/indices.flush.js index 1099650fa..94d64e23e 100644 --- a/api/api/indices.flush.js +++ b/api/api/indices.flush.js @@ -119,6 +119,8 @@ function buildIndicesFlush (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.flush_synced.js b/api/api/indices.flush_synced.js index df404cee0..f4c69b758 100644 --- a/api/api/indices.flush_synced.js +++ b/api/api/indices.flush_synced.js @@ -114,6 +114,8 @@ function buildIndicesFlushSynced (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.forcemerge.js b/api/api/indices.forcemerge.js index 5bf900cc6..b5249ecfc 100644 --- a/api/api/indices.forcemerge.js +++ b/api/api/indices.forcemerge.js @@ -122,6 +122,8 @@ function buildIndicesForcemerge (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.freeze.js b/api/api/indices.freeze.js index 944a9b00a..0400b00d5 100644 --- a/api/api/indices.freeze.js +++ b/api/api/indices.freeze.js @@ -115,6 +115,8 @@ function buildIndicesFreeze (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get.js b/api/api/indices.get.js index 6a4047c83..3e909ecc4 100644 --- a/api/api/indices.get.js +++ b/api/api/indices.get.js @@ -128,6 +128,8 @@ function buildIndicesGet (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_alias.js b/api/api/indices.get_alias.js index fc2f508ef..d016d5741 100644 --- a/api/api/indices.get_alias.js +++ b/api/api/indices.get_alias.js @@ -121,6 +121,8 @@ function buildIndicesGetAlias (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_field_mapping.js b/api/api/indices.get_field_mapping.js index 78dcfcc0c..70a9efaa0 100644 --- a/api/api/indices.get_field_mapping.js +++ b/api/api/indices.get_field_mapping.js @@ -132,6 +132,8 @@ function buildIndicesGetFieldMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_mapping.js b/api/api/indices.get_mapping.js index 5534a5cec..c7eb7160c 100644 --- a/api/api/indices.get_mapping.js +++ b/api/api/indices.get_mapping.js @@ -127,6 +127,8 @@ function buildIndicesGetMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_settings.js b/api/api/indices.get_settings.js index 5af0ba622..79d82cbee 100644 --- a/api/api/indices.get_settings.js +++ b/api/api/indices.get_settings.js @@ -130,6 +130,8 @@ function buildIndicesGetSettings (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_template.js b/api/api/indices.get_template.js index 315c9d9ad..68d6a6b51 100644 --- a/api/api/indices.get_template.js +++ b/api/api/indices.get_template.js @@ -116,6 +116,8 @@ function buildIndicesGetTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.get_upgrade.js b/api/api/indices.get_upgrade.js index c5acf2611..06781bda7 100644 --- a/api/api/indices.get_upgrade.js +++ b/api/api/indices.get_upgrade.js @@ -114,6 +114,8 @@ function buildIndicesGetUpgrade (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.open.js b/api/api/indices.open.js index ba585f805..742cb028d 100644 --- a/api/api/indices.open.js +++ b/api/api/indices.open.js @@ -122,6 +122,8 @@ function buildIndicesOpen (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.put_alias.js b/api/api/indices.put_alias.js index 68710d615..c6d2df4a3 100644 --- a/api/api/indices.put_alias.js +++ b/api/api/indices.put_alias.js @@ -122,6 +122,8 @@ function buildIndicesPutAlias (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.put_mapping.js b/api/api/indices.put_mapping.js index 20dee2bf8..b477739c0 100644 --- a/api/api/indices.put_mapping.js +++ b/api/api/indices.put_mapping.js @@ -136,6 +136,8 @@ function buildIndicesPutMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.put_settings.js b/api/api/indices.put_settings.js index c12a1a47d..ba394a719 100644 --- a/api/api/indices.put_settings.js +++ b/api/api/indices.put_settings.js @@ -126,6 +126,8 @@ function buildIndicesPutSettings (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.put_template.js b/api/api/indices.put_template.js index 2ccc9a5a6..931a2ab85 100644 --- a/api/api/indices.put_template.js +++ b/api/api/indices.put_template.js @@ -121,6 +121,8 @@ function buildIndicesPutTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.recovery.js b/api/api/indices.recovery.js index 226637439..7362561b7 100644 --- a/api/api/indices.recovery.js +++ b/api/api/indices.recovery.js @@ -110,6 +110,8 @@ function buildIndicesRecovery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.refresh.js b/api/api/indices.refresh.js index e246af298..1a263c834 100644 --- a/api/api/indices.refresh.js +++ b/api/api/indices.refresh.js @@ -114,6 +114,8 @@ function buildIndicesRefresh (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.rollover.js b/api/api/indices.rollover.js index 73ad046be..8b7fecb73 100644 --- a/api/api/indices.rollover.js +++ b/api/api/indices.rollover.js @@ -127,6 +127,8 @@ function buildIndicesRollover (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.segments.js b/api/api/indices.segments.js index d571c8c65..a9feb67f5 100644 --- a/api/api/indices.segments.js +++ b/api/api/indices.segments.js @@ -116,6 +116,8 @@ function buildIndicesSegments (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.shard_stores.js b/api/api/indices.shard_stores.js index f835b5975..35d5924b8 100644 --- a/api/api/indices.shard_stores.js +++ b/api/api/indices.shard_stores.js @@ -116,6 +116,8 @@ function buildIndicesShardStores (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.shrink.js b/api/api/indices.shrink.js index 9316b53a8..c746add6b 100644 --- a/api/api/indices.shrink.js +++ b/api/api/indices.shrink.js @@ -121,6 +121,8 @@ function buildIndicesShrink (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.split.js b/api/api/indices.split.js index 1dad6769d..50f2501a0 100644 --- a/api/api/indices.split.js +++ b/api/api/indices.split.js @@ -121,6 +121,8 @@ function buildIndicesSplit (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.stats.js b/api/api/indices.stats.js index d630947f9..bc0524bc8 100644 --- a/api/api/indices.stats.js +++ b/api/api/indices.stats.js @@ -136,6 +136,8 @@ function buildIndicesStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.unfreeze.js b/api/api/indices.unfreeze.js index cac430b25..81a55968f 100644 --- a/api/api/indices.unfreeze.js +++ b/api/api/indices.unfreeze.js @@ -115,6 +115,8 @@ function buildIndicesUnfreeze (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.update_aliases.js b/api/api/indices.update_aliases.js index 869bd1e42..5c83d0798 100644 --- a/api/api/indices.update_aliases.js +++ b/api/api/indices.update_aliases.js @@ -106,6 +106,8 @@ function buildIndicesUpdateAliases (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.upgrade.js b/api/api/indices.upgrade.js index a2b5e25b6..bae33c59a 100644 --- a/api/api/indices.upgrade.js +++ b/api/api/indices.upgrade.js @@ -120,6 +120,8 @@ function buildIndicesUpgrade (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/indices.validate_query.js b/api/api/indices.validate_query.js index fca278548..3dea50479 100644 --- a/api/api/indices.validate_query.js +++ b/api/api/indices.validate_query.js @@ -139,6 +139,8 @@ function buildIndicesValidateQuery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/info.js b/api/api/info.js index 681d465a4..0d5eb79e1 100644 --- a/api/api/info.js +++ b/api/api/info.js @@ -100,6 +100,8 @@ function buildInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ingest.delete_pipeline.js b/api/api/ingest.delete_pipeline.js index b4b8f63d7..68a8479c4 100644 --- a/api/api/ingest.delete_pipeline.js +++ b/api/api/ingest.delete_pipeline.js @@ -110,6 +110,8 @@ function buildIngestDeletePipeline (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ingest.get_pipeline.js b/api/api/ingest.get_pipeline.js index 90a82a3e8..29a01d7ab 100644 --- a/api/api/ingest.get_pipeline.js +++ b/api/api/ingest.get_pipeline.js @@ -108,6 +108,8 @@ function buildIngestGetPipeline (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ingest.processor_grok.js b/api/api/ingest.processor_grok.js index 0d05d1c07..679fbadbc 100644 --- a/api/api/ingest.processor_grok.js +++ b/api/api/ingest.processor_grok.js @@ -100,6 +100,8 @@ function buildIngestProcessorGrok (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ingest.put_pipeline.js b/api/api/ingest.put_pipeline.js index 7a1296345..6e2940b7b 100644 --- a/api/api/ingest.put_pipeline.js +++ b/api/api/ingest.put_pipeline.js @@ -111,6 +111,8 @@ function buildIngestPutPipeline (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ingest.simulate.js b/api/api/ingest.simulate.js index 9a7b790fe..c8f83721e 100644 --- a/api/api/ingest.simulate.js +++ b/api/api/ingest.simulate.js @@ -108,6 +108,8 @@ function buildIngestSimulate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.delete.js b/api/api/license.delete.js index 9b77a9c21..fdf2efbc6 100644 --- a/api/api/license.delete.js +++ b/api/api/license.delete.js @@ -95,6 +95,8 @@ function buildLicenseDelete (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.get.js b/api/api/license.get.js index 454a8a8c4..57266aa82 100644 --- a/api/api/license.get.js +++ b/api/api/license.get.js @@ -96,6 +96,8 @@ function buildLicenseGet (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.get_basic_status.js b/api/api/license.get_basic_status.js index c25cf35d5..cccf3ffef 100644 --- a/api/api/license.get_basic_status.js +++ b/api/api/license.get_basic_status.js @@ -95,6 +95,8 @@ function buildLicenseGetBasicStatus (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.get_trial_status.js b/api/api/license.get_trial_status.js index a3c1dda69..dcc9091cc 100644 --- a/api/api/license.get_trial_status.js +++ b/api/api/license.get_trial_status.js @@ -95,6 +95,8 @@ function buildLicenseGetTrialStatus (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.post.js b/api/api/license.post.js index c194aa073..b29cb4d32 100644 --- a/api/api/license.post.js +++ b/api/api/license.post.js @@ -91,6 +91,8 @@ function buildLicensePost (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.post_start_basic.js b/api/api/license.post_start_basic.js index d71ab0195..272e61fc4 100644 --- a/api/api/license.post_start_basic.js +++ b/api/api/license.post_start_basic.js @@ -96,6 +96,8 @@ function buildLicensePostStartBasic (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/license.post_start_trial.js b/api/api/license.post_start_trial.js index 339d58dd5..79207341f 100644 --- a/api/api/license.post_start_trial.js +++ b/api/api/license.post_start_trial.js @@ -98,6 +98,8 @@ function buildLicensePostStartTrial (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/mget.js b/api/api/mget.js index f01283b20..14b29eaf4 100644 --- a/api/api/mget.js +++ b/api/api/mget.js @@ -134,6 +134,8 @@ function buildMget (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/migration.deprecations.js b/api/api/migration.deprecations.js index d9e7b55bc..727d3a5ba 100644 --- a/api/api/migration.deprecations.js +++ b/api/api/migration.deprecations.js @@ -100,6 +100,8 @@ function buildMigrationDeprecations (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.close_job.js b/api/api/ml.close_job.js index c5b2fb379..ec61d7008 100644 --- a/api/api/ml.close_job.js +++ b/api/api/ml.close_job.js @@ -103,6 +103,8 @@ function buildMlCloseJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_calendar.js b/api/api/ml.delete_calendar.js index 4d2cd5920..dc94d6b92 100644 --- a/api/api/ml.delete_calendar.js +++ b/api/api/ml.delete_calendar.js @@ -100,6 +100,8 @@ function buildMlDeleteCalendar (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_calendar_event.js b/api/api/ml.delete_calendar_event.js index 4470e735f..4846c13fe 100644 --- a/api/api/ml.delete_calendar_event.js +++ b/api/api/ml.delete_calendar_event.js @@ -111,6 +111,8 @@ function buildMlDeleteCalendarEvent (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_calendar_job.js b/api/api/ml.delete_calendar_job.js index 3bf8d33b8..27ebb4341 100644 --- a/api/api/ml.delete_calendar_job.js +++ b/api/api/ml.delete_calendar_job.js @@ -111,6 +111,8 @@ function buildMlDeleteCalendarJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_datafeed.js b/api/api/ml.delete_datafeed.js index 1cee977d0..5350874cb 100644 --- a/api/api/ml.delete_datafeed.js +++ b/api/api/ml.delete_datafeed.js @@ -101,6 +101,8 @@ function buildMlDeleteDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_expired_data.js b/api/api/ml.delete_expired_data.js index cf21a2e86..d28a54756 100644 --- a/api/api/ml.delete_expired_data.js +++ b/api/api/ml.delete_expired_data.js @@ -95,6 +95,8 @@ function buildMlDeleteExpiredData (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_filter.js b/api/api/ml.delete_filter.js index cdf204830..e14c6004a 100644 --- a/api/api/ml.delete_filter.js +++ b/api/api/ml.delete_filter.js @@ -100,6 +100,8 @@ function buildMlDeleteFilter (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_forecast.js b/api/api/ml.delete_forecast.js index bb112a9ce..61578af3c 100644 --- a/api/api/ml.delete_forecast.js +++ b/api/api/ml.delete_forecast.js @@ -115,6 +115,8 @@ function buildMlDeleteForecast (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_job.js b/api/api/ml.delete_job.js index 7a63de2b5..2dab49868 100644 --- a/api/api/ml.delete_job.js +++ b/api/api/ml.delete_job.js @@ -103,6 +103,8 @@ function buildMlDeleteJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.delete_model_snapshot.js b/api/api/ml.delete_model_snapshot.js index 62a071ec1..ee7e86377 100644 --- a/api/api/ml.delete_model_snapshot.js +++ b/api/api/ml.delete_model_snapshot.js @@ -111,6 +111,8 @@ function buildMlDeleteModelSnapshot (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.find_file_structure.js b/api/api/ml.find_file_structure.js index f48a83c03..1e6de545e 100644 --- a/api/api/ml.find_file_structure.js +++ b/api/api/ml.find_file_structure.js @@ -128,6 +128,8 @@ function buildMlFindFileStructure (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.flush_job.js b/api/api/ml.flush_job.js index a2e1dae52..f2b062ee2 100644 --- a/api/api/ml.flush_job.js +++ b/api/api/ml.flush_job.js @@ -108,6 +108,8 @@ function buildMlFlushJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.forecast.js b/api/api/ml.forecast.js index b623627fb..065d17c6c 100644 --- a/api/api/ml.forecast.js +++ b/api/api/ml.forecast.js @@ -103,6 +103,8 @@ function buildMlForecast (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_buckets.js b/api/api/ml.get_buckets.js index 80873c653..f00ae7a47 100644 --- a/api/api/ml.get_buckets.js +++ b/api/api/ml.get_buckets.js @@ -127,6 +127,8 @@ function buildMlGetBuckets (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_calendar_events.js b/api/api/ml.get_calendar_events.js index c7aa2d77a..85540eb2a 100644 --- a/api/api/ml.get_calendar_events.js +++ b/api/api/ml.get_calendar_events.js @@ -110,6 +110,8 @@ function buildMlGetCalendarEvents (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_calendars.js b/api/api/ml.get_calendars.js index 2792f7e50..71d9b2771 100644 --- a/api/api/ml.get_calendars.js +++ b/api/api/ml.get_calendars.js @@ -98,6 +98,8 @@ function buildMlGetCalendars (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_categories.js b/api/api/ml.get_categories.js index 4ab14462f..8ee43bac5 100644 --- a/api/api/ml.get_categories.js +++ b/api/api/ml.get_categories.js @@ -105,6 +105,8 @@ function buildMlGetCategories (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_datafeed_stats.js b/api/api/ml.get_datafeed_stats.js index e1e61aa33..d7dd811aa 100644 --- a/api/api/ml.get_datafeed_stats.js +++ b/api/api/ml.get_datafeed_stats.js @@ -101,6 +101,8 @@ function buildMlGetDatafeedStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_datafeeds.js b/api/api/ml.get_datafeeds.js index 4f7fb7d66..6135237cb 100644 --- a/api/api/ml.get_datafeeds.js +++ b/api/api/ml.get_datafeeds.js @@ -101,6 +101,8 @@ function buildMlGetDatafeeds (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_filters.js b/api/api/ml.get_filters.js index f3f4a74e9..3c83a37f8 100644 --- a/api/api/ml.get_filters.js +++ b/api/api/ml.get_filters.js @@ -103,6 +103,8 @@ function buildMlGetFilters (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_influencers.js b/api/api/ml.get_influencers.js index 591d40e85..6ce303a12 100644 --- a/api/api/ml.get_influencers.js +++ b/api/api/ml.get_influencers.js @@ -114,6 +114,8 @@ function buildMlGetInfluencers (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_job_stats.js b/api/api/ml.get_job_stats.js index c0855dc08..8b5a68e27 100644 --- a/api/api/ml.get_job_stats.js +++ b/api/api/ml.get_job_stats.js @@ -101,6 +101,8 @@ function buildMlGetJobStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_jobs.js b/api/api/ml.get_jobs.js index 17d83fec9..688334416 100644 --- a/api/api/ml.get_jobs.js +++ b/api/api/ml.get_jobs.js @@ -101,6 +101,8 @@ function buildMlGetJobs (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_model_snapshots.js b/api/api/ml.get_model_snapshots.js index 466c6829d..7bfa74eb3 100644 --- a/api/api/ml.get_model_snapshots.js +++ b/api/api/ml.get_model_snapshots.js @@ -119,6 +119,8 @@ function buildMlGetModelSnapshots (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_overall_buckets.js b/api/api/ml.get_overall_buckets.js index ba1c7c9ac..e6ee6338c 100644 --- a/api/api/ml.get_overall_buckets.js +++ b/api/api/ml.get_overall_buckets.js @@ -114,6 +114,8 @@ function buildMlGetOverallBuckets (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.get_records.js b/api/api/ml.get_records.js index 3a3e5335f..5bcfbe7b0 100644 --- a/api/api/ml.get_records.js +++ b/api/api/ml.get_records.js @@ -114,6 +114,8 @@ function buildMlGetRecords (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.info.js b/api/api/ml.info.js index 3e0b95328..b53019e0e 100644 --- a/api/api/ml.info.js +++ b/api/api/ml.info.js @@ -89,6 +89,8 @@ function buildMlInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.open_job.js b/api/api/ml.open_job.js index 72b4ab402..ec9a3268f 100644 --- a/api/api/ml.open_job.js +++ b/api/api/ml.open_job.js @@ -102,6 +102,8 @@ function buildMlOpenJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.post_calendar_events.js b/api/api/ml.post_calendar_events.js index 8ad6e683d..e671d27f9 100644 --- a/api/api/ml.post_calendar_events.js +++ b/api/api/ml.post_calendar_events.js @@ -101,6 +101,8 @@ function buildMlPostCalendarEvents (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.post_data.js b/api/api/ml.post_data.js index 4661fc231..5f500c989 100644 --- a/api/api/ml.post_data.js +++ b/api/api/ml.post_data.js @@ -105,6 +105,8 @@ function buildMlPostData (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.preview_datafeed.js b/api/api/ml.preview_datafeed.js index 0f78bc7dd..4a09368a1 100644 --- a/api/api/ml.preview_datafeed.js +++ b/api/api/ml.preview_datafeed.js @@ -100,6 +100,8 @@ function buildMlPreviewDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.put_calendar.js b/api/api/ml.put_calendar.js index bcd5d40ac..5f469ac85 100644 --- a/api/api/ml.put_calendar.js +++ b/api/api/ml.put_calendar.js @@ -97,6 +97,8 @@ function buildMlPutCalendar (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.put_calendar_job.js b/api/api/ml.put_calendar_job.js index 3f160c47d..4af04e926 100644 --- a/api/api/ml.put_calendar_job.js +++ b/api/api/ml.put_calendar_job.js @@ -111,6 +111,8 @@ function buildMlPutCalendarJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.put_datafeed.js b/api/api/ml.put_datafeed.js index 2de0baa75..d7da534fe 100644 --- a/api/api/ml.put_datafeed.js +++ b/api/api/ml.put_datafeed.js @@ -101,6 +101,8 @@ function buildMlPutDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.put_filter.js b/api/api/ml.put_filter.js index 057f71e1e..6f423c071 100644 --- a/api/api/ml.put_filter.js +++ b/api/api/ml.put_filter.js @@ -101,6 +101,8 @@ function buildMlPutFilter (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.put_job.js b/api/api/ml.put_job.js index 0aa4a256e..fa78d3239 100644 --- a/api/api/ml.put_job.js +++ b/api/api/ml.put_job.js @@ -101,6 +101,8 @@ function buildMlPutJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.revert_model_snapshot.js b/api/api/ml.revert_model_snapshot.js index 41ff3c13b..162a2682c 100644 --- a/api/api/ml.revert_model_snapshot.js +++ b/api/api/ml.revert_model_snapshot.js @@ -109,6 +109,8 @@ function buildMlRevertModelSnapshot (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.set_upgrade_mode.js b/api/api/ml.set_upgrade_mode.js index 57a4df4d1..d095c71f0 100644 --- a/api/api/ml.set_upgrade_mode.js +++ b/api/api/ml.set_upgrade_mode.js @@ -98,6 +98,8 @@ function buildMlSetUpgradeMode (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.start_datafeed.js b/api/api/ml.start_datafeed.js index 1c11f9f31..9ae986cf7 100644 --- a/api/api/ml.start_datafeed.js +++ b/api/api/ml.start_datafeed.js @@ -102,6 +102,8 @@ function buildMlStartDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.stop_datafeed.js b/api/api/ml.stop_datafeed.js index f845de47a..8e684ae2c 100644 --- a/api/api/ml.stop_datafeed.js +++ b/api/api/ml.stop_datafeed.js @@ -102,6 +102,8 @@ function buildMlStopDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.update_datafeed.js b/api/api/ml.update_datafeed.js index 486a2b881..7e5447521 100644 --- a/api/api/ml.update_datafeed.js +++ b/api/api/ml.update_datafeed.js @@ -101,6 +101,8 @@ function buildMlUpdateDatafeed (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.update_filter.js b/api/api/ml.update_filter.js index 0b203684d..f8de4abc7 100644 --- a/api/api/ml.update_filter.js +++ b/api/api/ml.update_filter.js @@ -101,6 +101,8 @@ function buildMlUpdateFilter (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.update_job.js b/api/api/ml.update_job.js index 2e9617666..c34144cd3 100644 --- a/api/api/ml.update_job.js +++ b/api/api/ml.update_job.js @@ -101,6 +101,8 @@ function buildMlUpdateJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.update_model_snapshot.js b/api/api/ml.update_model_snapshot.js index 7e80fa05b..e0dc3043f 100644 --- a/api/api/ml.update_model_snapshot.js +++ b/api/api/ml.update_model_snapshot.js @@ -112,6 +112,8 @@ function buildMlUpdateModelSnapshot (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.validate.js b/api/api/ml.validate.js index 61b6da7c7..256da469a 100644 --- a/api/api/ml.validate.js +++ b/api/api/ml.validate.js @@ -96,6 +96,8 @@ function buildMlValidate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ml.validate_detector.js b/api/api/ml.validate_detector.js index 8b00f4597..4540ff1d5 100644 --- a/api/api/ml.validate_detector.js +++ b/api/api/ml.validate_detector.js @@ -96,6 +96,8 @@ function buildMlValidateDetector (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/monitoring.bulk.js b/api/api/monitoring.bulk.js index 66054b3e4..96a7caba3 100644 --- a/api/api/monitoring.bulk.js +++ b/api/api/monitoring.bulk.js @@ -108,6 +108,8 @@ function buildMonitoringBulk (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/msearch.js b/api/api/msearch.js index a4615c4fb..1bf456a67 100644 --- a/api/api/msearch.js +++ b/api/api/msearch.js @@ -136,6 +136,8 @@ function buildMsearch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/msearch_template.js b/api/api/msearch_template.js index 1692f567f..7d877463d 100644 --- a/api/api/msearch_template.js +++ b/api/api/msearch_template.js @@ -130,6 +130,8 @@ function buildMsearchTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/mtermvectors.js b/api/api/mtermvectors.js index fe4c49a6e..a46362de3 100644 --- a/api/api/mtermvectors.js +++ b/api/api/mtermvectors.js @@ -138,6 +138,8 @@ function buildMtermvectors (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/nodes.hot_threads.js b/api/api/nodes.hot_threads.js index 08512b148..330bc47ba 100644 --- a/api/api/nodes.hot_threads.js +++ b/api/api/nodes.hot_threads.js @@ -124,6 +124,8 @@ function buildNodesHotThreads (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/nodes.info.js b/api/api/nodes.info.js index 4179dd155..4e27f08ff 100644 --- a/api/api/nodes.info.js +++ b/api/api/nodes.info.js @@ -115,6 +115,8 @@ function buildNodesInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/nodes.reload_secure_settings.js b/api/api/nodes.reload_secure_settings.js index 53f6a6a1a..7753eb77e 100644 --- a/api/api/nodes.reload_secure_settings.js +++ b/api/api/nodes.reload_secure_settings.js @@ -107,6 +107,8 @@ function buildNodesReloadSecureSettings (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/nodes.stats.js b/api/api/nodes.stats.js index 4553511fd..04425a8fb 100644 --- a/api/api/nodes.stats.js +++ b/api/api/nodes.stats.js @@ -134,6 +134,8 @@ function buildNodesStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/nodes.usage.js b/api/api/nodes.usage.js index 308a6645b..1d62545be 100644 --- a/api/api/nodes.usage.js +++ b/api/api/nodes.usage.js @@ -112,6 +112,8 @@ function buildNodesUsage (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ping.js b/api/api/ping.js index 71192c360..71a0dc79e 100644 --- a/api/api/ping.js +++ b/api/api/ping.js @@ -100,6 +100,8 @@ function buildPing (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/put_script.js b/api/api/put_script.js index bad10957b..9ffd1db70 100644 --- a/api/api/put_script.js +++ b/api/api/put_script.js @@ -124,6 +124,8 @@ function buildPutScript (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rank_eval.js b/api/api/rank_eval.js index a32132466..df81a0385 100644 --- a/api/api/rank_eval.js +++ b/api/api/rank_eval.js @@ -115,6 +115,8 @@ function buildRankEval (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/reindex.js b/api/api/reindex.js index 44949d112..c1286f6af 100644 --- a/api/api/reindex.js +++ b/api/api/reindex.js @@ -118,6 +118,8 @@ function buildReindex (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/reindex_rethrottle.js b/api/api/reindex_rethrottle.js index 605a2ea83..2a24b921b 100644 --- a/api/api/reindex_rethrottle.js +++ b/api/api/reindex_rethrottle.js @@ -112,6 +112,8 @@ function buildReindexRethrottle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/render_search_template.js b/api/api/render_search_template.js index 59bcab0b1..0564ba781 100644 --- a/api/api/render_search_template.js +++ b/api/api/render_search_template.js @@ -100,6 +100,8 @@ function buildRenderSearchTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.delete_job.js b/api/api/rollup.delete_job.js index 353c35094..b0a06fdb5 100644 --- a/api/api/rollup.delete_job.js +++ b/api/api/rollup.delete_job.js @@ -96,6 +96,8 @@ function buildRollupDeleteJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.get_jobs.js b/api/api/rollup.get_jobs.js index e88e8a8ef..cb1da9051 100644 --- a/api/api/rollup.get_jobs.js +++ b/api/api/rollup.get_jobs.js @@ -94,6 +94,8 @@ function buildRollupGetJobs (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.get_rollup_caps.js b/api/api/rollup.get_rollup_caps.js index aec85ccfa..3d24fbbaf 100644 --- a/api/api/rollup.get_rollup_caps.js +++ b/api/api/rollup.get_rollup_caps.js @@ -94,6 +94,8 @@ function buildRollupGetRollupCaps (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.get_rollup_index_caps.js b/api/api/rollup.get_rollup_index_caps.js index 1cf85f7c3..54f161dc9 100644 --- a/api/api/rollup.get_rollup_index_caps.js +++ b/api/api/rollup.get_rollup_index_caps.js @@ -96,6 +96,8 @@ function buildRollupGetRollupIndexCaps (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.put_job.js b/api/api/rollup.put_job.js index 5db700e80..cc8701e7f 100644 --- a/api/api/rollup.put_job.js +++ b/api/api/rollup.put_job.js @@ -101,6 +101,8 @@ function buildRollupPutJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.rollup_search.js b/api/api/rollup.rollup_search.js index 78094e181..4329cd2d9 100644 --- a/api/api/rollup.rollup_search.js +++ b/api/api/rollup.rollup_search.js @@ -116,6 +116,8 @@ function buildRollupRollupSearch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.start_job.js b/api/api/rollup.start_job.js index 48abec711..ced1af7fa 100644 --- a/api/api/rollup.start_job.js +++ b/api/api/rollup.start_job.js @@ -96,6 +96,8 @@ function buildRollupStartJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/rollup.stop_job.js b/api/api/rollup.stop_job.js index 1aa07fa2d..856bdfe09 100644 --- a/api/api/rollup.stop_job.js +++ b/api/api/rollup.stop_job.js @@ -100,6 +100,8 @@ function buildRollupStopJob (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/scripts_painless_context.js b/api/api/scripts_painless_context.js index 65e4fdac8..0ef7d852a 100644 --- a/api/api/scripts_painless_context.js +++ b/api/api/scripts_painless_context.js @@ -96,6 +96,8 @@ function buildScriptsPainlessContext (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/scripts_painless_execute.js b/api/api/scripts_painless_execute.js index 3a2785063..231a3e461 100644 --- a/api/api/scripts_painless_execute.js +++ b/api/api/scripts_painless_execute.js @@ -95,6 +95,8 @@ function buildScriptsPainlessExecute (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/scroll.js b/api/api/scroll.js index 0bfd11aff..565b0925b 100644 --- a/api/api/scroll.js +++ b/api/api/scroll.js @@ -108,6 +108,8 @@ function buildScroll (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/search.js b/api/api/search.js index c7c08cd8d..a4c73501e 100644 --- a/api/api/search.js +++ b/api/api/search.js @@ -220,6 +220,8 @@ function buildSearch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/search_shards.js b/api/api/search_shards.js index 43eed2ed8..bae036cef 100644 --- a/api/api/search_shards.js +++ b/api/api/search_shards.js @@ -120,6 +120,8 @@ function buildSearchShards (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/search_template.js b/api/api/search_template.js index aadc63aaf..3a81eeba3 100644 --- a/api/api/search_template.js +++ b/api/api/search_template.js @@ -149,6 +149,8 @@ function buildSearchTemplate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.authenticate.js b/api/api/security.authenticate.js index 747b7718c..0a144693a 100644 --- a/api/api/security.authenticate.js +++ b/api/api/security.authenticate.js @@ -95,6 +95,8 @@ function buildSecurityAuthenticate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.change_password.js b/api/api/security.change_password.js index b0a9ed5d0..3a78e5825 100644 --- a/api/api/security.change_password.js +++ b/api/api/security.change_password.js @@ -102,6 +102,8 @@ function buildSecurityChangePassword (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.clear_cached_realms.js b/api/api/security.clear_cached_realms.js index 8cd3bf99b..aab70cec5 100644 --- a/api/api/security.clear_cached_realms.js +++ b/api/api/security.clear_cached_realms.js @@ -101,6 +101,8 @@ function buildSecurityClearCachedRealms (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.clear_cached_roles.js b/api/api/security.clear_cached_roles.js index 41de57377..c23b1c66e 100644 --- a/api/api/security.clear_cached_roles.js +++ b/api/api/security.clear_cached_roles.js @@ -100,6 +100,8 @@ function buildSecurityClearCachedRoles (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.create_api_key.js b/api/api/security.create_api_key.js index bb5e69379..a2e0cd315 100644 --- a/api/api/security.create_api_key.js +++ b/api/api/security.create_api_key.js @@ -97,6 +97,8 @@ function buildSecurityCreateApiKey (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.delete_privileges.js b/api/api/security.delete_privileges.js index 9cfd26d1c..e64714740 100644 --- a/api/api/security.delete_privileges.js +++ b/api/api/security.delete_privileges.js @@ -112,6 +112,8 @@ function buildSecurityDeletePrivileges (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.delete_role.js b/api/api/security.delete_role.js index 6fb2d0496..96ea78039 100644 --- a/api/api/security.delete_role.js +++ b/api/api/security.delete_role.js @@ -101,6 +101,8 @@ function buildSecurityDeleteRole (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.delete_role_mapping.js b/api/api/security.delete_role_mapping.js index 700d76f4f..208c950fa 100644 --- a/api/api/security.delete_role_mapping.js +++ b/api/api/security.delete_role_mapping.js @@ -101,6 +101,8 @@ function buildSecurityDeleteRoleMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.delete_user.js b/api/api/security.delete_user.js index 7fb437fe2..3e176ea8d 100644 --- a/api/api/security.delete_user.js +++ b/api/api/security.delete_user.js @@ -101,6 +101,8 @@ function buildSecurityDeleteUser (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.disable_user.js b/api/api/security.disable_user.js index a15e13b2a..3c7d3c000 100644 --- a/api/api/security.disable_user.js +++ b/api/api/security.disable_user.js @@ -101,6 +101,8 @@ function buildSecurityDisableUser (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.enable_user.js b/api/api/security.enable_user.js index f13274d71..2b044b3a5 100644 --- a/api/api/security.enable_user.js +++ b/api/api/security.enable_user.js @@ -101,6 +101,8 @@ function buildSecurityEnableUser (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_api_key.js b/api/api/security.get_api_key.js index 9a82ec39e..eb8af6ea9 100644 --- a/api/api/security.get_api_key.js +++ b/api/api/security.get_api_key.js @@ -102,6 +102,8 @@ function buildSecurityGetApiKey (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_privileges.js b/api/api/security.get_privileges.js index ef4045ff1..f7e697124 100644 --- a/api/api/security.get_privileges.js +++ b/api/api/security.get_privileges.js @@ -109,6 +109,8 @@ function buildSecurityGetPrivileges (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_role.js b/api/api/security.get_role.js index d2b433f1d..ca9e9a542 100644 --- a/api/api/security.get_role.js +++ b/api/api/security.get_role.js @@ -100,6 +100,8 @@ function buildSecurityGetRole (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_role_mapping.js b/api/api/security.get_role_mapping.js index 1c3e2287c..77c43e053 100644 --- a/api/api/security.get_role_mapping.js +++ b/api/api/security.get_role_mapping.js @@ -100,6 +100,8 @@ function buildSecurityGetRoleMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_token.js b/api/api/security.get_token.js index 6e3245b62..b397e77cd 100644 --- a/api/api/security.get_token.js +++ b/api/api/security.get_token.js @@ -96,6 +96,8 @@ function buildSecurityGetToken (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_user.js b/api/api/security.get_user.js index abedf7cc5..d8bb47568 100644 --- a/api/api/security.get_user.js +++ b/api/api/security.get_user.js @@ -100,6 +100,8 @@ function buildSecurityGetUser (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.get_user_privileges.js b/api/api/security.get_user_privileges.js index cf2449bd5..fdf7e5168 100644 --- a/api/api/security.get_user_privileges.js +++ b/api/api/security.get_user_privileges.js @@ -95,6 +95,8 @@ function buildSecurityGetUserPrivileges (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.has_privileges.js b/api/api/security.has_privileges.js index ba46e6fde..22c4c6cf1 100644 --- a/api/api/security.has_privileges.js +++ b/api/api/security.has_privileges.js @@ -101,6 +101,8 @@ function buildSecurityHasPrivileges (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.invalidate_api_key.js b/api/api/security.invalidate_api_key.js index f32685f97..983ef2ac8 100644 --- a/api/api/security.invalidate_api_key.js +++ b/api/api/security.invalidate_api_key.js @@ -96,6 +96,8 @@ function buildSecurityInvalidateApiKey (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.invalidate_token.js b/api/api/security.invalidate_token.js index 0e891bf38..98e6eb702 100644 --- a/api/api/security.invalidate_token.js +++ b/api/api/security.invalidate_token.js @@ -96,6 +96,8 @@ function buildSecurityInvalidateToken (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.put_privileges.js b/api/api/security.put_privileges.js index c20c25a91..4de0d967f 100644 --- a/api/api/security.put_privileges.js +++ b/api/api/security.put_privileges.js @@ -97,6 +97,8 @@ function buildSecurityPutPrivileges (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.put_role.js b/api/api/security.put_role.js index 3becd8b55..388ff9709 100644 --- a/api/api/security.put_role.js +++ b/api/api/security.put_role.js @@ -102,6 +102,8 @@ function buildSecurityPutRole (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.put_role_mapping.js b/api/api/security.put_role_mapping.js index 612bdb873..8b3847096 100644 --- a/api/api/security.put_role_mapping.js +++ b/api/api/security.put_role_mapping.js @@ -102,6 +102,8 @@ function buildSecurityPutRoleMapping (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/security.put_user.js b/api/api/security.put_user.js index 73e1e6722..9703b86fd 100644 --- a/api/api/security.put_user.js +++ b/api/api/security.put_user.js @@ -102,6 +102,8 @@ function buildSecurityPutUser (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.create.js b/api/api/snapshot.create.js index e1aa00e93..a54cc4b8e 100644 --- a/api/api/snapshot.create.js +++ b/api/api/snapshot.create.js @@ -119,6 +119,8 @@ function buildSnapshotCreate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.create_repository.js b/api/api/snapshot.create_repository.js index ff1c1f80c..7d06c4135 100644 --- a/api/api/snapshot.create_repository.js +++ b/api/api/snapshot.create_repository.js @@ -113,6 +113,8 @@ function buildSnapshotCreateRepository (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.delete.js b/api/api/snapshot.delete.js index 22f309ae7..86e090012 100644 --- a/api/api/snapshot.delete.js +++ b/api/api/snapshot.delete.js @@ -119,6 +119,8 @@ function buildSnapshotDelete (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.delete_repository.js b/api/api/snapshot.delete_repository.js index 0316765cd..48aa929e1 100644 --- a/api/api/snapshot.delete_repository.js +++ b/api/api/snapshot.delete_repository.js @@ -110,6 +110,8 @@ function buildSnapshotDeleteRepository (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.get.js b/api/api/snapshot.get.js index f3b4243f6..621f7417c 100644 --- a/api/api/snapshot.get.js +++ b/api/api/snapshot.get.js @@ -124,6 +124,8 @@ function buildSnapshotGet (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.get_repository.js b/api/api/snapshot.get_repository.js index f825b04a0..ae7d9fcdc 100644 --- a/api/api/snapshot.get_repository.js +++ b/api/api/snapshot.get_repository.js @@ -110,6 +110,8 @@ function buildSnapshotGetRepository (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.restore.js b/api/api/snapshot.restore.js index 7df0ac952..217bb7fef 100644 --- a/api/api/snapshot.restore.js +++ b/api/api/snapshot.restore.js @@ -119,6 +119,8 @@ function buildSnapshotRestore (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.status.js b/api/api/snapshot.status.js index d0820b6c6..bf15fa342 100644 --- a/api/api/snapshot.status.js +++ b/api/api/snapshot.status.js @@ -120,6 +120,8 @@ function buildSnapshotStatus (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/snapshot.verify_repository.js b/api/api/snapshot.verify_repository.js index ea23febc8..0bb67a727 100644 --- a/api/api/snapshot.verify_repository.js +++ b/api/api/snapshot.verify_repository.js @@ -110,6 +110,8 @@ function buildSnapshotVerifyRepository (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/sql.clear_cursor.js b/api/api/sql.clear_cursor.js index 0dac8e9b5..fccf6ba8d 100644 --- a/api/api/sql.clear_cursor.js +++ b/api/api/sql.clear_cursor.js @@ -96,6 +96,8 @@ function buildSqlClearCursor (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/sql.query.js b/api/api/sql.query.js index 0eb23acc2..2bcd7f6e7 100644 --- a/api/api/sql.query.js +++ b/api/api/sql.query.js @@ -97,6 +97,8 @@ function buildSqlQuery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/sql.translate.js b/api/api/sql.translate.js index be1325763..6b5147bb4 100644 --- a/api/api/sql.translate.js +++ b/api/api/sql.translate.js @@ -96,6 +96,8 @@ function buildSqlTranslate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/ssl.certificates.js b/api/api/ssl.certificates.js index 28f8fc9f7..8bf875df8 100644 --- a/api/api/ssl.certificates.js +++ b/api/api/ssl.certificates.js @@ -95,6 +95,8 @@ function buildSslCertificates (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/tasks.cancel.js b/api/api/tasks.cancel.js index 3d3dd5d3e..6e674b2b2 100644 --- a/api/api/tasks.cancel.js +++ b/api/api/tasks.cancel.js @@ -112,6 +112,8 @@ function buildTasksCancel (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/tasks.get.js b/api/api/tasks.get.js index 426fe46af..c3435158f 100644 --- a/api/api/tasks.get.js +++ b/api/api/tasks.get.js @@ -110,6 +110,8 @@ function buildTasksGet (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/tasks.list.js b/api/api/tasks.list.js index 57f170927..9d74e774d 100644 --- a/api/api/tasks.list.js +++ b/api/api/tasks.list.js @@ -117,6 +117,8 @@ function buildTasksList (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/termvectors.js b/api/api/termvectors.js index 2571b64fd..d2942bc23 100644 --- a/api/api/termvectors.js +++ b/api/api/termvectors.js @@ -139,6 +139,8 @@ function buildTermvectors (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/update.js b/api/api/update.js index 3a4f6120d..6584905ca 100644 --- a/api/api/update.js +++ b/api/api/update.js @@ -146,6 +146,8 @@ function buildUpdate (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/update_by_query.js b/api/api/update_by_query.js index ab41dcf72..ac34e44db 100644 --- a/api/api/update_by_query.js +++ b/api/api/update_by_query.js @@ -197,6 +197,8 @@ function buildUpdateByQuery (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/update_by_query_rethrottle.js b/api/api/update_by_query_rethrottle.js index 2937a00d1..050feed99 100644 --- a/api/api/update_by_query_rethrottle.js +++ b/api/api/update_by_query_rethrottle.js @@ -112,6 +112,8 @@ function buildUpdateByQueryRethrottle (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.ack_watch.js b/api/api/watcher.ack_watch.js index d7158969f..cc385c644 100644 --- a/api/api/watcher.ack_watch.js +++ b/api/api/watcher.ack_watch.js @@ -111,6 +111,8 @@ function buildWatcherAckWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.activate_watch.js b/api/api/watcher.activate_watch.js index 8012179d2..6823f734b 100644 --- a/api/api/watcher.activate_watch.js +++ b/api/api/watcher.activate_watch.js @@ -100,6 +100,8 @@ function buildWatcherActivateWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.deactivate_watch.js b/api/api/watcher.deactivate_watch.js index cd7cfa9bf..5d089ca4b 100644 --- a/api/api/watcher.deactivate_watch.js +++ b/api/api/watcher.deactivate_watch.js @@ -100,6 +100,8 @@ function buildWatcherDeactivateWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.delete_watch.js b/api/api/watcher.delete_watch.js index c126fea0c..21d41e1c9 100644 --- a/api/api/watcher.delete_watch.js +++ b/api/api/watcher.delete_watch.js @@ -100,6 +100,8 @@ function buildWatcherDeleteWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.execute_watch.js b/api/api/watcher.execute_watch.js index 633797a5d..8b5cf89d2 100644 --- a/api/api/watcher.execute_watch.js +++ b/api/api/watcher.execute_watch.js @@ -96,6 +96,8 @@ function buildWatcherExecuteWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.get_watch.js b/api/api/watcher.get_watch.js index 807ec2643..587089f94 100644 --- a/api/api/watcher.get_watch.js +++ b/api/api/watcher.get_watch.js @@ -100,6 +100,8 @@ function buildWatcherGetWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.put_watch.js b/api/api/watcher.put_watch.js index 4f6d1d701..695f6eb19 100644 --- a/api/api/watcher.put_watch.js +++ b/api/api/watcher.put_watch.js @@ -105,6 +105,8 @@ function buildWatcherPutWatch (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.start.js b/api/api/watcher.start.js index 5cd32357c..1053693f5 100644 --- a/api/api/watcher.start.js +++ b/api/api/watcher.start.js @@ -95,6 +95,8 @@ function buildWatcherStart (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.stats.js b/api/api/watcher.stats.js index efdae5e0d..ffa6b9bd9 100644 --- a/api/api/watcher.stats.js +++ b/api/api/watcher.stats.js @@ -103,6 +103,8 @@ function buildWatcherStats (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/watcher.stop.js b/api/api/watcher.stop.js index 18cb40f9e..d7873de19 100644 --- a/api/api/watcher.stop.js +++ b/api/api/watcher.stop.js @@ -95,6 +95,8 @@ function buildWatcherStop (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/xpack.info.js b/api/api/xpack.info.js index 13cefe3b2..22d1f9f18 100644 --- a/api/api/xpack.info.js +++ b/api/api/xpack.info.js @@ -96,6 +96,8 @@ function buildXpackInfo (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/api/api/xpack.usage.js b/api/api/xpack.usage.js index 50cd02732..1885f4d93 100644 --- a/api/api/xpack.usage.js +++ b/api/api/xpack.usage.js @@ -96,6 +96,8 @@ function buildXpackUsage (opts) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc index 45f186fd4..3d52ad5a5 100644 --- a/docs/configuration.asciidoc +++ b/docs/configuration.asciidoc @@ -133,6 +133,23 @@ function nodeSelector (connections) { return connections[index] } ---- + +|`generateRequestId` +a|`function` - function to generate the request id for every request, it takes two parameters, the request parameters and options. + +By default it generates an incremental integer for every request. + +_Custom function example:_ +[source,js] +---- +function generateRequestId (params, options) { + // your id generation logic + // must be syncronous + return 'id' +} +---- + +|`name` +|`string` - The name to identify the client instance in the events. + +_Default:_ `elasticsearch-js` |=== === Advanced configuration @@ -229,4 +246,4 @@ class MySerializer extends Serializer { const client = new Client({ Serializer: MySerializer }) ----- \ No newline at end of file +---- diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 8569a45b3..c0527c567 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -9,6 +9,7 @@ include::configuration.asciidoc[] include::reference.asciidoc[] include::breaking-changes.asciidoc[] include::authentication.asciidoc[] +include::observability.asciidoc[] include::child.asciidoc[] include::extend.asciidoc[] include::typescript.asciidoc[] diff --git a/docs/observability.asciidoc b/docs/observability.asciidoc new file mode 100644 index 000000000..c72c340e1 --- /dev/null +++ b/docs/observability.asciidoc @@ -0,0 +1,250 @@ +[[observability]] +== Observability + +The client does not provide a default logger, but instead it offers an event emitter interfaces to hook into internal events, such as `request` and `response`. + +Correlating those events can be quite hard, especially if your applications have a large codebase with many events happening at the same time. + +To help you with this, the client offers you a correlation id system and other features, let's see them in action. + +=== Events +The client is an event emitter, this means that you can listen for its event and add additional logic to your code, without need to change the client internals or your normal usage. + +You can find the events names by access the `events` key of the client. + +[source,js] +---- +const { events } = require('@elastic/elasticsearch') +console.log(events) +---- + +The event emitter functionality can be useful if you want to log every request, response and error that is happening during the use of the client. + +[source,js] +---- +const logger = require('my-logger')() +const { Client } = require('@elastic/elasticsearch') +const client = new Client({ node: 'http://localhost:9200' }) + +client.on('response', (err, result) => { + if (err) { + logger.error(err) + } else { + logger.info(result) + } +}) +---- + +The client emits the following events: +[cols=2*] +|=== +|`request` +a|Emitted before sending the actual request to Elasticsearch _(emitted multiple times in case of retries)_. +[source,js] +---- +client.on('request', (err, result) => { + console.log(err, result) +}) +---- + +|`response` +a|Emitted once Elasticsearch response has been received and parsed. +[source,js] +---- +client.on('response', (err, result) => { + console.log(err, result) +}) +---- + +|`sniff` +a|Emitted when the client ends a sniffing request. +[source,js] +---- +client.on('sniff', (err, result) => { + console.log(err, result) +}) +---- + +|`resurrect` +a|Emitted if the client is able to resurrect a dead node. +[source,js] +---- +client.on('resurrect', (err, result) => { + console.log(err, result) +}) +---- + +|=== + +The values of `result` in `request`, `response` and `sniff` will be: +[source,ts] +---- +body: any; +statusCode: number | null; +headers: anyObject | null; +warnings: string[] | null; +meta: { + context: any; + name: string; + request: { + params: TransportRequestParams; + options: TransportRequestOptions; + id: any; + }; + connection: Connection; + attempts: number; + aborted: boolean; + sniff?: { + hosts: any[]; + reason: string; + }; +}; +---- + +While the `result` value in `resurrect` will be: +[source,ts] +---- +strategy: string; +isAlive: boolean; +connection: Connection; +name: string; +request: { + id: any; +}; +---- + +=== Correlation id +Correlating events can be quite hard, especially if there are many events at the same time. The client offers you an automatic (and configurable) system to help you handle this problem. +[source,js] +---- +const { Client } = require('@elastic/elasticsearch') +const client = new Client({ node: 'http://localhost:9200' }) + +client.on('request', (err, result) => { + const { id } = result.meta.request + if (err) { + console.log({ error: err, reqId: id }) + } +}) + +client.on('response', (err, result) => { + const { id } = result.meta.request + if (err) { + console.log({ error: err, reqId: id }) + } +}) + +client.search({ + index: 'my-index', + body: { foo: 'bar' } +}, (err, result) => { + if (err) console.log(err) +}) +---- + +By default the id is an incremental integer, but you can easily configure that with the `generateRequestId` option: +[source,js] +---- +const { Client } = require('@elastic/elasticsearch') +const client = new Client({ + node: 'http://localhost:9200', + // it takes two parameters, the request parameters and options + generateRequestId: function (params, options) { + // your id generation logic + // must be syncronous + return 'id' + } +}) +---- + +You can also specify a custom id per request: +[source,js] +---- +client.search({ + index: 'my-index', + body: { foo: 'bar' } +}, { + id: 'custom-id' +}, (err, result) => { + if (err) console.log(err) +}) +---- + +=== Context object +Sometimes, you might need to make some custom data available in your events, you can do that via the `context` option of a request: +[source,js] +---- +const { Client } = require('@elastic/elasticsearch') +const client = new Client({ node: 'http://localhost:9200' }) + +client.on('request', (err, result) => { + const { id } = result.meta.request + const { context } = result.meta + if (err) { + console.log({ error: err, reqId: id, context }) + } +}) + +client.on('response', (err, result) => { + const { id } = result.meta.request + const { winter } = result.meta.context + if (err) { + console.log({ error: err, reqId: id, winter }) + } +}) + +client.search({ + index: 'my-index', + body: { foo: 'bar' } +}, { + context: { winter: 'is coming' } +}, (err, result) => { + if (err) console.log(err) +}) +---- + +=== Client name +If you are using multiple instances of the client or if you are using multiple child clients _(which is the recommended way to have multiple instances of the client)_, you might need to recognize which client you are using, the `name` options will help you in this regard: +[source,js] +---- +const { Client } = require('@elastic/elasticsearch') +const client = new Client({ + node: 'http://localhost:9200', + name: 'parent-client' // default to 'elasticsearch-js' +}) + +const child = client.child({ + name: 'child-client' +}) + +console.log(client.name, child.name) + +client.on('request', (err, result) => { + const { id } = result.meta.request + const { name } = result.meta + if (err) { + console.log({ error: err, reqId: id, name }) + } +}) + +client.on('response', (err, result) => { + const { id } = result.meta.request + const { name } = result.meta + if (err) { + console.log({ error: err, reqId: id, name }) + } +}) + +client.search({ + index: 'my-index', + body: { foo: 'bar' } +}, (err, result) => { + if (err) console.log(err) +}) + +child.search({ + index: 'my-index', + body: { foo: 'bar' } +}, (err, result) => { + if (err) console.log(err) +}) +---- diff --git a/docs/usage.asciidoc b/docs/usage.asciidoc index ed81ef2fc..bc1eeb60f 100644 --- a/docs/usage.asciidoc +++ b/docs/usage.asciidoc @@ -164,6 +164,14 @@ _Default:_ `null` |`querystring` |`object` - Custom querystring for the request. + _Default:_ `null` + +|`id` +|`any` - Custom request id. _(overrides the top level request id generator)_ + +_Default:_ `null` + +|`context` +|`any` - Custom object per request. _(you can use it to pass some data to the clients events)_ + +_Default:_ `null` |=== === Error handling @@ -203,103 +211,3 @@ Following you can find the errors exported by the client. |`ResponseError` |Generated when in case of a `4xx` or `5xx` response. |=== - -=== Events -The client is an event emitter, this means that you can listen for its event and add additional logic to your code, without need to change the client internals or your normal usage. + -You can find the events names by access the `events` key of the client. - -[source,js] ----- -const { events } = require('@elastic/elasticsearch') -console.log(events) ----- - -The event emitter functionality can be useful if you want to log every request, response and error that is happening during the use of the client. - -[source,js] ----- -const logger = require('my-logger')() -const { Client } = require('@elastic/elasticsearch') -const client = new Client({ node: 'http://localhost:9200' }) - -client.on('response', (err, req) => { - if (err) { - logger.error(err) - } else { - logger.info(req) - } -}) ----- - -The client emits the following events: -[cols=2*] -|=== -|`request` -a|Emitted before to send the actual request to Elasticsearch. -[source,js] ----- -client.on('request', (err, req) => { - console.log(err, req) -}) ----- - -|`response` -a|Emitted before to send the actual request to Elasticsearch. -[source,js] ----- -client.on('response', (err, req) => { - console.log(err, req) -}) ----- - -|`sniff` -a|Emitted before to send the actual request to Elasticsearch. -[source,js] ----- -client.on('sniff', (err, req) => { - console.log(err, req) -}) ----- - -|`resurrect` -a|Emitted before to send the actual request to Elasticsearch. -[source,js] ----- -client.on('resurrect', (err, req) => { - console.log(err, req) -}) ----- - -|=== - -The values of `req` in `request`, `response` and `sniff` will be: -[source,ts] ----- - body: any; - statusCode: number | null; - headers: anyObject | null; - warnings: string[] | null; - meta: { - request: { - params: TransportRequestParams; - options: TransportRequestOptions; - }; - connection: Connection; - attempts: number; - aborted: boolean; - sniff?: { - hosts: any[]; - reason: string; - }; - }; ----- - -While the `req` value in `resurrect` will be: -[source,ts] ----- -export interface ResurrectEvent { - strategy: string; - isAlive: boolean; - connection: Connection; -} ----- diff --git a/index.d.ts b/index.d.ts index 22e83efe8..5bce05610 100644 --- a/index.d.ts +++ b/index.d.ts @@ -28,6 +28,7 @@ import Transport, { TransportRequestOptions, nodeFilterFn, nodeSelectorFn, + generateRequestIdFn, TransportRequestCallback } from './lib/Transport'; import Connection, { AgentOptions, agentFn } from './lib/Connection'; @@ -93,6 +94,8 @@ interface ClientOptions { nodeFilter?: nodeFilterFn; nodeSelector?: nodeSelectorFn | string; headers?: anyObject; + generateRequestId?: generateRequestIdFn; + name?: string; cloud?: { id: string; username: string; diff --git a/index.js b/index.js index 27a77a9ac..7f5b3c1c3 100644 --- a/index.js +++ b/index.js @@ -80,12 +80,15 @@ class Client extends EventEmitter { agent: null, headers: {}, nodeFilter: null, - nodeSelector: 'round-robin' + nodeSelector: 'round-robin', + generateRequestId: null, + name: 'elasticsearch-js' }, opts) this[kInitialOptions] = options this[kExtensions] = [] + this.name = options.name this.serializer = new options.Serializer() this.connectionPool = new options.ConnectionPool({ pingTimeout: options.pingTimeout, @@ -118,7 +121,9 @@ class Client extends EventEmitter { compression: options.compression, headers: options.headers, nodeFilter: options.nodeFilter, - nodeSelector: options.nodeSelector + nodeSelector: options.nodeSelector, + generateRequestId: options.generateRequestId, + name: options.name }) const apis = buildApi({ diff --git a/lib/ConnectionPool.d.ts b/lib/ConnectionPool.d.ts index 9acbb7d01..5b68d7d36 100644 --- a/lib/ConnectionPool.d.ts +++ b/lib/ConnectionPool.d.ts @@ -36,10 +36,20 @@ export interface getConnectionOptions { selector?: nodeSelectorFn; } +export interface resurrectOptions { + now?: number; + requestId: string; + name: string; +} + export interface ResurrectEvent { strategy: string; isAlive: boolean; connection: Connection; + name: string; + request: { + id: any; + }; } export default class ConnectionPool { @@ -79,10 +89,10 @@ export default class ConnectionPool { * If enabled, tries to resurrect a connection with the given * resurrect strategy ('ping', 'optimistic', 'none'). * - * @param {number} epoch + * @param {object} { now, requestId, name } * @param {function} callback (isAlive, connection) */ - resurrect(now?: number, callback?: (isAlive: boolean | null, connection: Connection | null) => void): void; + resurrect(opts: resurrectOptions, callback?: (isAlive: boolean | null, connection: Connection | null) => void): void; /** * Returns an alive connection if present, * otherwise returns null. diff --git a/lib/ConnectionPool.js b/lib/ConnectionPool.js index 6a164d4ae..3f12a64a4 100644 --- a/lib/ConnectionPool.js +++ b/lib/ConnectionPool.js @@ -108,10 +108,10 @@ class ConnectionPool { * If enabled, tries to resurrect a connection with the given * resurrect strategy ('ping', 'optimistic', 'none'). * - * @param {number} epoch + * @param {object} { now, requestId } * @param {function} callback (isAlive, connection) */ - resurrect (now = Date.now(), callback = noop) { + resurrect (opts, callback = noop) { if (this.resurrectStrategy === 0 || this.dead.length === 0) { debug('Nothing to resurrect') callback(null, null) @@ -121,7 +121,7 @@ class ConnectionPool { // the dead list is sorted in ascending order based on the timeout // so the first element will always be the one with the smaller timeout const connection = this.connections.get(this.dead[0]) - if (now < connection.resurrectTimeout) { + if ((opts.now || Date.now()) < connection.resurrectTimeout) { debug('Nothing to resurrect') callback(null, null) return @@ -147,7 +147,13 @@ class ConnectionPool { debug(`Resurrect: connection '${id}' is now alive`) this.markAlive(connection) } - this.emit('resurrect', null, { strategy: 'ping', isAlive, connection }) + this.emit('resurrect', null, { + strategy: 'ping', + name: opts.name, + request: { id: opts.requestId }, + isAlive, + connection + }) callback(isAlive, connection) }) // optimistic strategy @@ -155,7 +161,13 @@ class ConnectionPool { debug(`Resurrect: optimistic resurrection for connection '${id}'`) this.dead.splice(this.dead.indexOf(id), 1) connection.status = Connection.statuses.ALIVE - this.emit('resurrect', null, { strategy: 'optimistic', isAlive: true, connection }) + this.emit('resurrect', null, { + strategy: 'optimistic', + name: opts.name, + request: { id: opts.requestId }, + isAlive: true, + connection + }) // eslint-disable-next-line standard/no-callback-literal callback(true, connection) } diff --git a/lib/Transport.d.ts b/lib/Transport.d.ts index 89ec11573..83981cf32 100644 --- a/lib/Transport.d.ts +++ b/lib/Transport.d.ts @@ -29,6 +29,10 @@ export interface nodeFilterFn { (connection: Connection): boolean; } +export interface generateRequestIdFn { + (params: TransportRequestParams, options: TransportRequestOptions): any; +} + declare type noopFn = (...args: any[]) => void; declare type emitFn = (event: string | symbol, ...args: any[]) => boolean; @@ -47,17 +51,22 @@ interface TransportOptions { nodeFilter?: nodeFilterFn; nodeSelector?: string | nodeSelectorFn; headers?: anyObject; + generateRequestId?: generateRequestIdFn; + name: string; } -export interface RequestEvent { +export interface RequestEvent { body: T; statusCode: number | null; headers: anyObject | null; warnings: string[] | null; meta: { + context: C; + name: string; request: { params: TransportRequestParams; options: TransportRequestOptions; + id: any; }; connection: Connection; attempts: number; @@ -71,7 +80,7 @@ export interface RequestEvent { // ApiResponse and RequestEvent are the same thing // we are doing this for have more clear names -export interface ApiResponse extends RequestEvent {} +export interface ApiResponse extends RequestEvent {} declare type anyObject = { [key: string]: any; @@ -93,6 +102,8 @@ export interface TransportRequestOptions { headers?: anyObject; querystring?: anyObject; compression?: string; + id?: any; + context?: any; warnings?: [string]; } @@ -100,6 +111,15 @@ export interface TransportRequestCallback { abort: () => void; } +export interface TransportGetConnectionOptions { + requestId: string; +} + +export interface TransportSniffOptions { + reason: string; + requestId?: string; +} + export default class Transport { static sniffReasons: { SNIFF_ON_START: string; @@ -123,8 +143,8 @@ export default class Transport { constructor(opts: TransportOptions); request(params: TransportRequestParams, options?: TransportRequestOptions): Promise; request(params: TransportRequestParams, options?: TransportRequestOptions, callback?: (err: Error | null, result: ApiResponse) => void): TransportRequestCallback; - getConnection(): Connection | null; - sniff(callback?: (...args: any[]) => void): void; + getConnection(opts: TransportGetConnectionOptions): Connection | null; + sniff(opts?: TransportSniffOptions, callback?: (...args: any[]) => void): void; } export {}; diff --git a/lib/Transport.js b/lib/Transport.js index f9ff4f092..3ea692b3a 100644 --- a/lib/Transport.js +++ b/lib/Transport.js @@ -50,6 +50,8 @@ class Transport { this.sniffInterval = opts.sniffInterval this.sniffOnConnectionFault = opts.sniffOnConnectionFault this.sniffEndpoint = opts.sniffEndpoint + this.generateRequestId = opts.generateRequestId || generateRequestId() + this.name = opts.name this.nodeFilter = opts.nodeFilter || defaultNodeFilter if (typeof opts.nodeSelector === 'function') { @@ -67,7 +69,7 @@ class Transport { this._isSniffing = false if (opts.sniffOnStart === true) { - this.sniff(Transport.sniffReasons.SNIFF_ON_START) + this.sniff({ reason: Transport.sniffReasons.SNIFF_ON_START }) } } @@ -89,10 +91,13 @@ class Transport { callback = once(callback) const meta = { + context: options.context || null, request: { params: null, - options: null + options: null, + id: options.id || this.generateRequestId(params, options) }, + name: this.name, connection: null, attempts: 0, aborted: false @@ -112,7 +117,7 @@ class Transport { const makeRequest = () => { if (meta.aborted === true) return - meta.connection = this.getConnection() + meta.connection = this.getConnection({ requestId: meta.request.id }) if (meta.connection === null) { return callback(new NoLivingConnectionsError('There are not living connections'), result) } @@ -192,7 +197,10 @@ class Transport { this.connectionPool.markDead(meta.connection) if (this.sniffOnConnectionFault === true) { - this.sniff(Transport.sniffReasons.SNIFF_ON_CONNECTION_FAULT) + this.sniff({ + reason: Transport.sniffReasons.SNIFF_ON_CONNECTION_FAULT, + requestId: meta.request.id + }) } // retry logic @@ -312,34 +320,36 @@ class Transport { } } - getConnection () { + getConnection (opts) { const now = Date.now() if (this._sniffEnabled === true && now > this._nextSniff) { - this.sniff(Transport.sniffReasons.SNIFF_INTERVAL) + this.sniff({ reason: Transport.sniffReasons.SNIFF_INTERVAL, requestId: opts.requestId }) } - this.connectionPool.resurrect(now) + this.connectionPool.resurrect({ now, requestId: opts.requestId, name: this.name }) return this.connectionPool.getConnection({ filter: this.nodeFilter, selector: this.nodeSelector }) } - sniff (reason = Transport.sniffReasons.DEFAULT, callback = noop) { + sniff (opts, callback = noop) { if (this._isSniffing === true) return this._isSniffing = true debug('Started sniffing request') - if (typeof reason === 'function') { - callback = reason - reason = Transport.sniffReasons.DEFAULT + if (typeof opts === 'function') { + callback = opts + opts = { reason: Transport.sniffReasons.DEFAULT } } + const { reason } = opts + const request = { method: 'GET', path: this.sniffEndpoint } - this.request(request, (err, result) => { + this.request(request, { id: opts.requestId }, (err, result) => { this._isSniffing = false if (this._sniffEnabled === true) { this._nextSniff = Date.now() + this.sniffInterval @@ -414,5 +424,12 @@ function randomSelector (connections) { return connections[index] } +function generateRequestId () { + var maxInt = 2147483647 + var nextReqId = 0 + return function genReqId (params, options) { + return (nextReqId = (nextReqId + 1) & maxInt) + } +} module.exports = Transport -module.exports.internals = { defaultNodeFilter, roundRobinSelector, randomSelector } +module.exports.internals = { defaultNodeFilter, roundRobinSelector, randomSelector, generateRequestId } diff --git a/scripts/utils/generateApis.js b/scripts/utils/generateApis.js index 9dbeb04b3..f00d49dc8 100644 --- a/scripts/utils/generateApis.js +++ b/scripts/utils/generateApis.js @@ -161,6 +161,8 @@ function generate (spec, common) { headers: options.headers || null, querystring: options.querystring || null, compression: options.compression || false, + id: options.id || null, + context: options.context || null, warnings } diff --git a/test/behavior/observability.test.js b/test/behavior/observability.test.js new file mode 100644 index 000000000..65c16ca6d --- /dev/null +++ b/test/behavior/observability.test.js @@ -0,0 +1,334 @@ +'use strict' + +const { test } = require('tap') +const lolex = require('lolex') +const { Client, Transport } = require('../../index') +const { + connection: { MockConnection, MockConnectionSniff } +} = require('../utils') +const noop = () => {} + +test('Request id', t => { + t.test('Default generateRequestId', t => { + const { generateRequestId } = Transport.internals + t.type(generateRequestId, 'function') + + const genReqId = generateRequestId() + t.type(genReqId, 'function') + + for (var i = 1; i <= 10; i++) { + t.strictEqual(genReqId(), i) + } + + t.end() + }) + + t.test('Custom generateRequestId', t => { + t.plan(7) + + const options = { context: { winter: 'is coming' } } + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + generateRequestId: function (requestParams, requestOptions) { + t.match(requestParams, { method: 'GET', path: '/' }) + t.match(requestOptions, options) + return 'custom-id' + } + }) + + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.request.id, 'custom-id') + }) + + client.on('response', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.request.id, 'custom-id') + }) + + client.info({}, options, t.error) + }) + + t.test('Custom request id in method options', t => { + t.plan(5) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection + }) + + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.request.id, 'custom-id') + }) + + client.on('response', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.request.id, 'custom-id') + }) + + client.info({}, { id: 'custom-id' }, t.error) + }) + + t.test('Sniff and correlation id', t => { + t.test('sniffOnStart - should autogenerate the id', t => { + t.plan(2) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnectionSniff, + sniffOnStart: true + }) + + client.on('sniff', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.request.id, 1) + }) + }) + + t.test('sniffOnConnectionFault - should use the request id', t => { + t.plan(5) + + const client = new Client({ + nodes: ['http://localhost:9200', 'http://localhost:9201'], + Connection: MockConnectionSniff, + sniffOnConnectionFault: true, + maxRetries: 0 + }) + + client.on('request', (e, { meta }) => { + t.strictEqual(meta.request.id, 'custom') + }) + + client.on('response', (e, { meta }) => { + t.strictEqual(meta.request.id, 'custom') + }) + + client.on('sniff', (e, { meta }) => { + t.strictEqual(meta.request.id, 'custom') + }) + + client.transport.request({ + path: '/500', + method: 'GET' + }, { + id: 'custom', + headers: { timeout: 'true' } + }, noop) + }) + + t.end() + }) + + t.test('Resurrect should use the same request id of the request that starts it', t => { + t.plan(2) + + const clock = lolex.install({ toFake: ['Date'] }) + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + sniffOnConnectionFault: true, + maxRetries: 0 + }) + + const conn = client.connectionPool.getConnection() + client.connectionPool.markDead(conn) + clock.tick(1000 * 61) + + client.on('resurrect', (err, meta) => { + t.error(err) + t.strictEqual(meta.request.id, 'custom') + clock.uninstall() + }) + + client.info({}, { id: 'custom' }, noop) + }) + + t.end() +}) + +test('Request context', t => { + t.test('no value', t => { + t.plan(5) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection + }) + + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.context, null) + }) + + client.on('response', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.context, null) + }) + + client.info(t.error) + }) + + t.test('custom value', t => { + t.plan(5) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection + }) + + client.on('request', (err, { meta }) => { + t.error(err) + t.deepEqual(meta.context, { winter: 'is coming' }) + }) + + client.on('response', (err, { meta }) => { + t.error(err) + t.deepEqual(meta.context, { winter: 'is coming' }) + }) + + client.info({}, { context: { winter: 'is coming' } }, t.error) + }) + + t.end() +}) + +test('Client name', t => { + t.test('Property of the client instance', t => { + const client = new Client({ + node: 'http://localhost:9200', + name: 'cluster' + }) + t.strictEqual(client.name, 'cluster') + t.end() + }) + + t.test('Is present in the event metadata', t => { + t.plan(6) + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + name: 'cluster' + }) + + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.name, 'cluster') + }) + + client.on('response', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.name, 'cluster') + }) + + client.info((err, { meta }) => { + t.error(err) + t.strictEqual(meta.name, 'cluster') + }) + }) + + t.test('Sniff and client name', t => { + t.test('sniffOnStart', t => { + t.plan(2) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnectionSniff, + sniffOnStart: true + }) + + client.on('sniff', (err, { meta }) => { + t.error(err) + t.strictEqual(meta.name, 'elasticsearch-js') + }) + }) + + t.test('sniffOnConnectionFault', t => { + t.plan(5) + + const client = new Client({ + nodes: ['http://localhost:9200', 'http://localhost:9201'], + Connection: MockConnectionSniff, + sniffOnConnectionFault: true, + maxRetries: 0 + }) + + client.on('request', (e, { meta }) => { + t.strictEqual(meta.name, 'elasticsearch-js') + }) + + client.on('response', (e, { meta }) => { + t.strictEqual(meta.name, 'elasticsearch-js') + }) + + client.on('sniff', (e, { meta }) => { + t.strictEqual(meta.name, 'elasticsearch-js') + }) + + client.transport.request({ + path: '/500', + method: 'GET' + }, { + headers: { timeout: 'true' } + }, noop) + }) + + t.end() + }) + + t.test('Resurrect should have the client name configured', t => { + t.plan(2) + + const clock = lolex.install({ toFake: ['Date'] }) + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + sniffOnConnectionFault: true, + maxRetries: 0 + }) + + const conn = client.connectionPool.getConnection() + client.connectionPool.markDead(conn) + clock.tick(1000 * 61) + + client.on('resurrect', (err, meta) => { + t.error(err) + t.strictEqual(meta.name, 'elasticsearch-js') + clock.uninstall() + }) + + client.info({}, { id: 'custom' }, noop) + }) + + t.test('Resurrect should have the client name configured (child client)', t => { + t.plan(2) + + const clock = lolex.install({ toFake: ['Date'] }) + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + sniffOnConnectionFault: true, + maxRetries: 0 + }) + + const child = client.child({ + name: 'child-client' + }) + + const conn = client.connectionPool.getConnection() + client.connectionPool.markDead(conn) + clock.tick(1000 * 61) + + client.on('resurrect', (err, meta) => { + t.error(err) + t.strictEqual(meta.name, 'child-client') + clock.uninstall() + }) + + child.info({}, { id: 'custom' }, noop) + }) + + t.end() +}) diff --git a/test/behavior/resurrect.test.js b/test/behavior/resurrect.test.js index 68aba8353..8c4d38ba2 100644 --- a/test/behavior/resurrect.test.js +++ b/test/behavior/resurrect.test.js @@ -37,7 +37,7 @@ const { Client, events } = require('../../index') */ test('Should execute the recurrect API with the ping strategy', t => { - t.plan(6) + t.plan(8) const clock = lolex.install({ toFake: ['Date'] }) const q = workq() @@ -59,6 +59,8 @@ test('Should execute the recurrect API with the ping strategy', t => { t.strictEqual(meta.strategy, 'ping') t.false(meta.isAlive) t.strictEqual(meta.connection.id, 'node0') + t.strictEqual(meta.name, 'elasticsearch-js') + t.deepEqual(meta.request, { id: 2 }) }) q.add((q, done) => { @@ -89,7 +91,7 @@ test('Should execute the recurrect API with the ping strategy', t => { }) test('Resurrect a node and handle 502/3/4 status code', t => { - t.plan(11) + t.plan(15) const clock = lolex.install({ toFake: ['Date'] }) const q = workq() @@ -114,10 +116,13 @@ test('Resurrect a node and handle 502/3/4 status code', t => { maxRetries: 0 }) + var idCount = 2 client.on(events.RESURRECT, (err, meta) => { t.error(err) t.strictEqual(meta.strategy, 'ping') t.strictEqual(meta.connection.id, 'node0') + t.strictEqual(meta.name, 'elasticsearch-js') + t.deepEqual(meta.request, { id: idCount++ }) if (count < 3) { t.false(meta.isAlive) } else { @@ -156,7 +161,7 @@ test('Resurrect a node and handle 502/3/4 status code', t => { }) test('Should execute the recurrect API with the optimistic strategy', t => { - t.plan(6) + t.plan(8) const clock = lolex.install({ toFake: ['Date'] }) const q = workq() @@ -179,6 +184,8 @@ test('Should execute the recurrect API with the optimistic strategy', t => { t.strictEqual(meta.strategy, 'optimistic') t.true(meta.isAlive) t.strictEqual(meta.connection.id, 'node0') + t.strictEqual(meta.name, 'elasticsearch-js') + t.deepEqual(meta.request, { id: 2 }) }) q.add((q, done) => { diff --git a/test/unit/child.test.js b/test/unit/child.test.js index 2e8ea1554..110a7e866 100644 --- a/test/unit/child.test.js +++ b/test/unit/child.test.js @@ -211,3 +211,72 @@ test('Should share the event emitter', t => { t.end() }) + +test('Should create a child client (generateRequestId check)', t => { + t.plan(6) + + function generateRequestId1 () { + var id = 0 + return () => `trace-1-${id++}` + } + + function generateRequestId2 () { + var id = 0 + return () => `trace-2-${id++}` + } + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + generateRequestId: generateRequestId1() + }) + const child = client.child({ + Connection: MockConnection, + generateRequestId: generateRequestId2() + }) + + var count = 0 + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual( + meta.request.id, + count++ === 0 ? 'trace-1-0' : 'trace-2-0' + ) + }) + + client.info(err => { + t.error(err) + child.info(t.error) + }) +}) + +test('Should create a child client (name check)', t => { + t.plan(8) + + const client = new Client({ + node: 'http://localhost:9200', + Connection: MockConnection, + name: 'parent' + }) + const child = client.child({ + Connection: MockConnection, + name: 'child' + }) + + t.strictEqual(client.name, 'parent') + t.strictEqual(child.name, 'child') + + var count = 0 + client.on('request', (err, { meta }) => { + t.error(err) + t.strictEqual( + meta.name, + count++ === 0 ? 'parent' : 'child' + ) + }) + + client.info(err => { + t.error(err) + child.info(t.error) + }) +}) diff --git a/test/unit/connection-pool.test.js b/test/unit/connection-pool.test.js index b288a6a43..fc9495766 100644 --- a/test/unit/connection-pool.test.js +++ b/test/unit/connection-pool.test.js @@ -118,7 +118,12 @@ test('API', t => { const href = 'http://localhost:9200/' var connection = pool.addConnection(href) pool.markDead(connection) - pool.resurrect(Date.now() + 1000 * 60 * 3, (isAlive, connection) => { + const opts = { + now: Date.now() + 1000 * 60 * 3, + requestId: 1, + name: 'elasticsearch-js' + } + pool.resurrect(opts, (isAlive, connection) => { t.true(isAlive) connection = pool.connections.get(connection.id) t.strictEqual(connection.deadCount, 0) @@ -139,7 +144,12 @@ test('API', t => { const href = 'http://localhost:9200/' var connection = pool.addConnection(href) pool.markDead(connection) - pool.resurrect(Date.now() + 1000 * 60 * 3, (isAlive, connection) => { + const opts = { + now: Date.now() + 1000 * 60 * 3, + requestId: 1, + name: 'elasticsearch-js' + } + pool.resurrect(opts, (isAlive, connection) => { t.false(isAlive) connection = pool.connections.get(connection.id) t.strictEqual(connection.deadCount, 2) @@ -162,7 +172,12 @@ test('API', t => { const href = 'http://localhost:9200/' var connection = pool.addConnection(href) pool.markDead(connection) - pool.resurrect(Date.now() + 1000 * 60 * 3, (isAlive, connection) => { + const opts = { + now: Date.now() + 1000 * 60 * 3, + requestId: 1, + name: 'elasticsearch-js' + } + pool.resurrect(opts, (isAlive, connection) => { t.true(isAlive) connection = pool.connections.get(connection.id) t.strictEqual(connection.deadCount, 1) @@ -182,7 +197,12 @@ test('API', t => { const href = 'http://localhost:9200/' var connection = pool.addConnection(href) pool.markDead(connection) - pool.resurrect(Date.now() + 1000 * 60 * 3, (isAlive, connection) => { + const opts = { + now: Date.now() + 1000 * 60 * 3, + requestId: 1, + name: 'elasticsearch-js' + } + pool.resurrect(opts, (isAlive, connection) => { t.ok(isAlive === null) t.ok(connection === null) connection = pool.connections.get(href) diff --git a/test/unit/events.test.js b/test/unit/events.test.js index a40f72386..d8029f2d5 100644 --- a/test/unit/events.test.js +++ b/test/unit/events.test.js @@ -40,6 +40,8 @@ test('Should emit a request event when a request is performed', t => { headers: null, warnings: null, meta: { + context: null, + name: 'elasticsearch-js', request: { params: { method: 'GET', @@ -59,7 +61,8 @@ test('Should emit a request event when a request is performed', t => { headers: null, compression: false, warnings: null - } + }, + id: 1 }, connection: { id: 'http://localhost:9200' @@ -97,6 +100,8 @@ test('Should emit a response event in case of a successful response', t => { }, warnings: null, meta: { + context: null, + name: 'elasticsearch-js', request: { params: { method: 'GET', @@ -116,7 +121,8 @@ test('Should emit a response event in case of a successful response', t => { headers: null, compression: false, warnings: null - } + }, + id: 1 }, connection: { id: 'http://localhost:9200' @@ -152,6 +158,8 @@ test('Should emit a response event with the error set', t => { headers: null, warnings: null, meta: { + context: null, + name: 'elasticsearch-js', request: { params: { method: 'GET', @@ -171,7 +179,8 @@ test('Should emit a response event with the error set', t => { headers: null, compression: false, warnings: null - } + }, + id: 1 }, connection: { id: 'http://localhost:9200' diff --git a/test/unit/transport.test.js b/test/unit/transport.test.js index c7c789950..b9e079dc3 100644 --- a/test/unit/transport.test.js +++ b/test/unit/transport.test.js @@ -704,11 +704,13 @@ test('Should call markAlive with a successful response', t => { }) test('Should call resurrect on every request', t => { - t.plan(3) + t.plan(5) class CustomConnectionPool extends ConnectionPool { - resurrect (now) { + resurrect ({ now, requestId, name }) { t.type(now, 'number') + t.type(requestId, 'number') + t.type(name, 'string') } } @@ -725,7 +727,8 @@ test('Should call resurrect on every request', t => { maxRetries: 3, requestTimeout: 30000, sniffInterval: false, - sniffOnStart: false + sniffOnStart: false, + name: 'elasticsearch-js' }) transport.request({ @@ -2107,3 +2110,30 @@ test('Should accept custom querystring in the optons object', t => { t.end() }) + +test('Should pass request params and options to generateRequestId', t => { + t.plan(3) + + const pool = new ConnectionPool({ Connection: MockConnection }) + pool.addConnection('http://localhost:9200') + + const params = { method: 'GET', path: '/hello' } + const options = { context: { winter: 'is coming' } } + + const transport = new Transport({ + emit: () => {}, + connectionPool: pool, + serializer: new Serializer(), + maxRetries: 3, + requestTimeout: 30000, + sniffInterval: false, + sniffOnStart: false, + generateRequestId: function (requestParams, requestOptions) { + t.deepEqual(requestParams, params) + t.deepEqual(requestOptions, options) + return 'id' + } + }) + + transport.request(params, options, t.error) +}) diff --git a/test/utils/MockConnection.js b/test/utils/MockConnection.js index 938bfd47a..7f16e27d4 100644 --- a/test/utils/MockConnection.js +++ b/test/utils/MockConnection.js @@ -73,6 +73,47 @@ class MockConnectionError extends Connection { } } +class MockConnectionSniff extends Connection { + request (params, callback) { + var aborted = false + const sniffResult = { + nodes: { + 'node-1': { + http: { + publish_address: 'localhost:9200' + }, + roles: ['master', 'data', 'ingest'] + }, + 'node-2': { + http: { + publish_address: 'localhost:9201' + }, + roles: ['master', 'data', 'ingest'] + } + } + } + const stream = intoStream(JSON.stringify(sniffResult)) + stream.statusCode = setStatusCode(params.path) + stream.headers = { + 'content-type': 'application/json;utf=8', + 'date': new Date().toISOString(), + 'connection': 'keep-alive', + 'content-length': '205' + } + process.nextTick(() => { + if (!aborted) { + if (params.headers.timeout) { + callback(new TimeoutError('Request timed out', params), null) + } else { + callback(null, stream) + } + } + }) + return { + abort: () => { aborted = true } + } + } +} function setStatusCode (path) { const statusCode = Number(path.slice(1)) if (Number.isInteger(statusCode)) { @@ -81,4 +122,9 @@ function setStatusCode (path) { return 200 } -module.exports = { MockConnection, MockConnectionTimeout, MockConnectionError } +module.exports = { + MockConnection, + MockConnectionTimeout, + MockConnectionError, + MockConnectionSniff +}