Merge branch 'master' into feature/sql
Original commit: elastic/x-pack-elasticsearch@4c504025ce
This commit is contained in:
commit
1a434636fe
|
@ -1,512 +0,0 @@
|
||||||
# ELASTICSEARCH CONFIDENTIAL
|
|
||||||
# __________________
|
|
||||||
#
|
|
||||||
# [2014] Elasticsearch Incorporated. All Rights Reserved.
|
|
||||||
#
|
|
||||||
# NOTICE: All information contained herein is, and remains
|
|
||||||
# the property of Elasticsearch Incorporated and its suppliers,
|
|
||||||
# if any. The intellectual and technical concepts contained
|
|
||||||
# herein are proprietary to Elasticsearch Incorporated
|
|
||||||
# and its suppliers and may be covered by U.S. and Foreign Patents,
|
|
||||||
# patents in process, and are protected by trade secret or copyright law.
|
|
||||||
# Dissemination of this information or reproduction of this material
|
|
||||||
# is strictly forbidden unless prior written permission is obtained
|
|
||||||
# from Elasticsearch Incorporated.
|
|
||||||
|
|
||||||
# Creates indices with old versions of elasticsearch. These indices are used by x-pack plugins like security
|
|
||||||
# to test if the import of metadata that is stored in elasticsearch indexes works correctly.
|
|
||||||
# This tool will start a node on port 9200/9300. If a node is already running on that port then the script will fail.
|
|
||||||
# Currently this script can only deal with versions >=2.0.0 and < 5.0. Needs more work for versions before or after.
|
|
||||||
#
|
|
||||||
# Run from x-plugins root directory like so:
|
|
||||||
# python3 ./dev-tools/create_bwc_indexes.py 2.3.4
|
|
||||||
# You can get any particular version of elasticsearch with:
|
|
||||||
# python3 ../elasticsearch/dev-tools/get-bwc-version.py 2.3.4
|
|
||||||
#
|
|
||||||
#
|
|
||||||
import argparse
|
|
||||||
import glob
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
import random
|
|
||||||
import shutil
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
import tempfile
|
|
||||||
import time
|
|
||||||
import requests
|
|
||||||
import socket
|
|
||||||
import signal
|
|
||||||
from cmd import Cmd
|
|
||||||
|
|
||||||
DEFAULT_TRANSPORT_TCP_PORT = 9300
|
|
||||||
DEFAULT_HTTP_TCP_PORT = 9200
|
|
||||||
|
|
||||||
if sys.version_info[0] < 3:
|
|
||||||
print('%s must use python 3.x (for the ES python client)' % sys.argv[0])
|
|
||||||
|
|
||||||
try:
|
|
||||||
from elasticsearch import Elasticsearch
|
|
||||||
from elasticsearch.exceptions import ConnectionError
|
|
||||||
from elasticsearch.exceptions import TransportError
|
|
||||||
from elasticsearch.exceptions import NotFoundError
|
|
||||||
from elasticsearch.client import IndicesClient
|
|
||||||
except ImportError as e:
|
|
||||||
print('Can\'t import elasticsearch please install `sudo pip3 install elasticsearch`')
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
def start_node(version, release_dir, data_dir):
|
|
||||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
||||||
result = sock.connect_ex(('localhost',DEFAULT_HTTP_TCP_PORT))
|
|
||||||
if result == 0:
|
|
||||||
raise Exception('Elasticsearch instance already running on port ' + str(DEFAULT_HTTP_TCP_PORT))
|
|
||||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
||||||
result = sock.connect_ex(('localhost',DEFAULT_TRANSPORT_TCP_PORT))
|
|
||||||
if result == 0:
|
|
||||||
raise Exception('Elasticsearch instance already running on port ' + str(DEFAULT_TRANSPORT_TCP_PORT))
|
|
||||||
logging.info('Starting node from %s on port %s/%s, data_dir %s' % (release_dir, DEFAULT_TRANSPORT_TCP_PORT
|
|
||||||
, DEFAULT_HTTP_TCP_PORT, data_dir))
|
|
||||||
cluster_name = 'bwc_index_' + version
|
|
||||||
if parse_version(version) < parse_version("5.0.0-alpha1"):
|
|
||||||
prefix = '-Des.'
|
|
||||||
else:
|
|
||||||
prefix = '-E'
|
|
||||||
cmd = [
|
|
||||||
os.path.join(release_dir, 'bin/elasticsearch'),
|
|
||||||
'%spath.data=%s' % (prefix, data_dir),
|
|
||||||
'%spath.logs=logs' % prefix,
|
|
||||||
'%scluster.name=%s' % (prefix, cluster_name),
|
|
||||||
'%snetwork.host=localhost' % prefix,
|
|
||||||
'%stransport.tcp.port=%s' % (prefix, DEFAULT_TRANSPORT_TCP_PORT), # not sure if we need to customize ports
|
|
||||||
'%shttp.port=%s' % (prefix, DEFAULT_HTTP_TCP_PORT)
|
|
||||||
]
|
|
||||||
|
|
||||||
return subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
||||||
|
|
||||||
def install_plugin(version, release_dir, plugin_name):
|
|
||||||
args = [plugin_name]
|
|
||||||
if parse_version(version) >= parse_version('2.2.0'):
|
|
||||||
args = [plugin_name, '--batch']
|
|
||||||
run_plugin(version, release_dir, 'install', args)
|
|
||||||
|
|
||||||
def remove_plugin(version, release_dir, plugin_name):
|
|
||||||
# 5.0 doesn't like trying to remove a plugin that isn't installed so we
|
|
||||||
# shouldn't try.
|
|
||||||
if os.path.exists(os.path.join(release_dir, 'plugins', plugin_name)):
|
|
||||||
run_plugin(version, release_dir, 'remove', [plugin_name])
|
|
||||||
|
|
||||||
def run_plugin(version, release_dir, plugin_cmd, args):
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
script = 'bin/plugin'
|
|
||||||
else:
|
|
||||||
script = 'bin/elasticsearch-plugin'
|
|
||||||
cmd = [os.path.join(release_dir, script), plugin_cmd] + args
|
|
||||||
subprocess.check_call(cmd)
|
|
||||||
|
|
||||||
def create_client():
|
|
||||||
logging.info('Waiting for node to startup')
|
|
||||||
for _ in range(0, 30):
|
|
||||||
try:
|
|
||||||
client = Elasticsearch([{'host': 'localhost', 'port': 9200, 'http_auth':'es_admin:0123456789'}])
|
|
||||||
health = client.cluster.health(wait_for_nodes=1)
|
|
||||||
return client
|
|
||||||
except ConnectionError:
|
|
||||||
logging.info('Not started yet...')
|
|
||||||
time.sleep(1)
|
|
||||||
assert False, 'Timed out waiting for node for %s seconds' % timeout
|
|
||||||
|
|
||||||
def wait_for_yellow(version, client, index):
|
|
||||||
logging.info('Waiting for %s to be yellow' % index)
|
|
||||||
# The health call below uses `params` because it the 5.x client doesn't
|
|
||||||
# support wait_for_relocating_shards and the 2.x client doesn't support
|
|
||||||
# wait_for_relocating_shards and we'd like to use the same client for both
|
|
||||||
# versions.
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
health = client.cluster.health(wait_for_status='yellow', index=index, params={'wait_for_relocating_shards':0})
|
|
||||||
else:
|
|
||||||
health = client.cluster.health(wait_for_status='yellow', index=index, params={'wait_for_no_relocating_shards':'true'})
|
|
||||||
assert health['timed_out'] == False, 'cluster health timed out %s' % health
|
|
||||||
|
|
||||||
# this adds a user bwc_test_role/9876543210, a role bwc_test_role and some documents the user has or has not access to
|
|
||||||
def generate_security_index(client, version):
|
|
||||||
|
|
||||||
logging.info('Add a group')
|
|
||||||
# don't know how to use python client with shield so use curl instead
|
|
||||||
# add a user
|
|
||||||
body = {
|
|
||||||
"password" : "9876543210",
|
|
||||||
"roles" : [ "bwc_test_role" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
while True:
|
|
||||||
response = requests.put('http://localhost:9200/_shield/user/bwc_test_user', auth=('es_admin', '0123456789'), data=json.dumps(body))
|
|
||||||
logging.info('put user reponse: ' + response.text)
|
|
||||||
if response.status_code == 200:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
if 'service has not been started' in response.text:
|
|
||||||
continue
|
|
||||||
raise Exception('PUT http://localhost:9200/_shield/role/bwc_test_role did not succeed!')
|
|
||||||
|
|
||||||
|
|
||||||
# add a role
|
|
||||||
body = {
|
|
||||||
"cluster": ["all"],
|
|
||||||
"indices": [
|
|
||||||
{
|
|
||||||
"names": [ "index1", "index2" ],
|
|
||||||
"privileges": ["all"],
|
|
||||||
"query": "{\"match\": {\"title\": \"foo\"}}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"run_as": [ "other_user" ]
|
|
||||||
}
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
body['indices'][0]['fields'] = [ "title", "body" ]
|
|
||||||
else:
|
|
||||||
body['indices'][0]['field_security'] = { "grant": [ "title", "body" ] }
|
|
||||||
# order of params in put role request is important, see https://github.com/elastic/x-plugins/issues/2606
|
|
||||||
response = requests.put('http://localhost:9200/_shield/role/bwc_test_role', auth=('es_admin', '0123456789')
|
|
||||||
, data=json.dumps(body, sort_keys=True))
|
|
||||||
logging.info('put user reponse: ' + response.text)
|
|
||||||
if (response.status_code != 200) :
|
|
||||||
raise Exception('PUT http://localhost:9200/_shield/role/bwc_test_role did not succeed!')
|
|
||||||
|
|
||||||
client.index(index="index1", doc_type="doc", body={"title": "foo",
|
|
||||||
"body": "bwc_test_user should be able to see this field",
|
|
||||||
"secured_body": "bwc_test_user should not be able to see this field"})
|
|
||||||
client.index(index="index1", doc_type="doc", body={"title": "bwc_test_user should not be able to see this document"})
|
|
||||||
|
|
||||||
client.index(index="index2", doc_type="doc", body={"title": "foo",
|
|
||||||
"body": "bwc_test_user should be able to see this field",
|
|
||||||
"secured_body": "bwc_test_user should not be able to see this field"})
|
|
||||||
client.index(index="index2", doc_type="doc", body={"title": "bwc_test_user should not be able to see this document"})
|
|
||||||
|
|
||||||
client.index(index="index3", doc_type="doc", body={"title": "bwc_test_user should not see this index"})
|
|
||||||
|
|
||||||
if parse_version(version) < parse_version('5.1.0'):
|
|
||||||
logging.info("Adding a alias that starts with - so we can test against it")
|
|
||||||
client.indices.put_alias(index='index3', name='-index3')
|
|
||||||
|
|
||||||
wait_for_yellow(version, client, '.security')
|
|
||||||
|
|
||||||
# this adds a couple of watches and waits for the the watch_history to accumulate some results
|
|
||||||
def generate_watcher_index(client, version):
|
|
||||||
logging.info('Adding a watch')
|
|
||||||
body = {
|
|
||||||
"trigger" : {
|
|
||||||
"schedule": {
|
|
||||||
"interval": "1s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"input" : {
|
|
||||||
"search" : {
|
|
||||||
"timeout": "100s",
|
|
||||||
"request" : {
|
|
||||||
"indices" : [ ".watches" ],
|
|
||||||
"body" : {
|
|
||||||
"query" : { "match_all" : {}},
|
|
||||||
"size": 1
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"condition" : {
|
|
||||||
"always" : {}
|
|
||||||
},
|
|
||||||
"throttle_period": "1s",
|
|
||||||
"actions" : {
|
|
||||||
"index_payload" : {
|
|
||||||
"transform" : {
|
|
||||||
"search" : {
|
|
||||||
"request" : {
|
|
||||||
"body" : { "size": 1, "query" : { "match_all" : {} }}
|
|
||||||
},
|
|
||||||
"timeout": "100s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"index" : {
|
|
||||||
"index" : "bwc_watch_index",
|
|
||||||
"doc_type" : "bwc_watch_type",
|
|
||||||
"timeout": "100s"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
response = requests.put('http://localhost:9200/_watcher/watch/bwc_watch', auth=('es_admin', '0123456789'), data=json.dumps(body))
|
|
||||||
logging.info('PUT watch response: ' + response.text)
|
|
||||||
if (response.status_code != 201) :
|
|
||||||
raise Exception('PUT http://localhost:9200/_watcher/watch/bwc_watch did not succeed!')
|
|
||||||
|
|
||||||
logging.info('Adding a watch with "fun" throttle periods')
|
|
||||||
body = {
|
|
||||||
"trigger" : {
|
|
||||||
"schedule": {
|
|
||||||
"interval": "1s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"condition" : {
|
|
||||||
"never" : {}
|
|
||||||
},
|
|
||||||
"throttle_period": "100s",
|
|
||||||
"actions" : {
|
|
||||||
"index_payload" : {
|
|
||||||
"throttle_period": "100s",
|
|
||||||
"transform" : {
|
|
||||||
"search" : {
|
|
||||||
"request" : {
|
|
||||||
"body" : { "size": 1, "query" : { "match_all" : {} }}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"index" : {
|
|
||||||
"index" : "bwc_watch_index",
|
|
||||||
"doc_type" : "bwc_watch_type"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
response = requests.put('http://localhost:9200/_watcher/watch/bwc_throttle_period', auth=('es_admin', '0123456789'), data=json.dumps(body))
|
|
||||||
logging.info('PUT watch response: ' + response.text)
|
|
||||||
if (response.status_code != 201) :
|
|
||||||
raise Exception('PUT http://localhost:9200/_watcher/watch/bwc_throttle_period did not succeed!')
|
|
||||||
|
|
||||||
if parse_version(version) < parse_version('2.3.0'):
|
|
||||||
logging.info('Skipping watch with a funny read timeout because email attachement is not supported by this version')
|
|
||||||
else:
|
|
||||||
logging.info('Adding a watch with a funny read timeout')
|
|
||||||
body = {
|
|
||||||
"trigger" : {
|
|
||||||
"schedule": {
|
|
||||||
"interval": "100s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"condition": {
|
|
||||||
"never": {}
|
|
||||||
},
|
|
||||||
"actions": {
|
|
||||||
"work": {
|
|
||||||
"email": {
|
|
||||||
"to": "email@domain.com",
|
|
||||||
"subject": "Test Kibana PDF report",
|
|
||||||
"attachments": {
|
|
||||||
"test_report.pdf": {
|
|
||||||
"http": {
|
|
||||||
"content_type": "application/pdf",
|
|
||||||
"request": {
|
|
||||||
"read_timeout": "100s",
|
|
||||||
"scheme": "https",
|
|
||||||
"host": "example.com",
|
|
||||||
"path":"{{ctx.metadata.report_url}}",
|
|
||||||
"port": 8443,
|
|
||||||
"auth": {
|
|
||||||
"basic": {
|
|
||||||
"username": "Aladdin",
|
|
||||||
"password": "open sesame"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
response = requests.put('http://localhost:9200/_watcher/watch/bwc_funny_timeout', auth=('es_admin', '0123456789'), data=json.dumps(body))
|
|
||||||
logging.info('PUT watch response: ' + response.text)
|
|
||||||
if (response.status_code != 201) :
|
|
||||||
raise Exception('PUT http://localhost:9200/_watcher/watch/bwc_funny_timeout did not succeed!')
|
|
||||||
|
|
||||||
# wait to accumulate some watches
|
|
||||||
logging.info('Waiting for watch results index to fill up...')
|
|
||||||
wait_for_search(10, lambda: client.search(index="bwc_watch_index", body={"query": {"match_all": {}}}))
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
watcher_history_name = ".watch_history*"
|
|
||||||
else:
|
|
||||||
watcher_history_name = ".watcher-history*"
|
|
||||||
wait_for_search(10, lambda: client.search(index=watcher_history_name, body={"query": {"match_all": {}}}))
|
|
||||||
|
|
||||||
wait_for_yellow(version, client, '.watches')
|
|
||||||
wait_for_yellow(version, client, watcher_history_name)
|
|
||||||
wait_for_yellow(version, client, 'bwc_watch_index')
|
|
||||||
|
|
||||||
def wait_for_monitoring_index_to_fill(client, version):
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
monitoring_name = '.marvel-*'
|
|
||||||
else:
|
|
||||||
monitoring_name = '.monitoring-*'
|
|
||||||
def wait_for_monitoring_to_index(doc_type, count):
|
|
||||||
logging.info('Waiting for %s to have count(%s) = %s...' % (monitoring_name, doc_type, count))
|
|
||||||
wait_for_search(count, lambda:
|
|
||||||
client.search(index=monitoring_name, body={"query": {"term": { "type": doc_type }}}))
|
|
||||||
|
|
||||||
wait_for_monitoring_to_index('index_stats', 10)
|
|
||||||
wait_for_monitoring_to_index('shards', 10)
|
|
||||||
wait_for_monitoring_to_index('indices_stats', 3)
|
|
||||||
wait_for_monitoring_to_index('node_stats', 3)
|
|
||||||
wait_for_monitoring_to_index('cluster_stats', 3)
|
|
||||||
|
|
||||||
wait_for_yellow(version, client, monitoring_name)
|
|
||||||
|
|
||||||
def wait_for_search(required_count, searcher):
|
|
||||||
for attempt in range(1, 31):
|
|
||||||
try:
|
|
||||||
response = searcher()
|
|
||||||
logging.info('(' + str(attempt) + ') Got ' + str(response['hits']['total']) + ' hits and want ' + str(required_count) + '...')
|
|
||||||
if response['hits']['total'] >= required_count:
|
|
||||||
return
|
|
||||||
except NotFoundError:
|
|
||||||
logging.info('(' + str(attempt) + ') Not found, retrying')
|
|
||||||
time.sleep(1)
|
|
||||||
logger.error("Ran out of retries")
|
|
||||||
raise "Ran out of retries"
|
|
||||||
|
|
||||||
def compress_index(version, tmp_dir, output_dir):
|
|
||||||
compress(tmp_dir, output_dir, 'x-pack-%s.zip' % version, 'data')
|
|
||||||
|
|
||||||
def compress(tmp_dir, output_dir, zipfile, directory):
|
|
||||||
abs_output_dir = os.path.abspath(output_dir)
|
|
||||||
zipfile = os.path.join(abs_output_dir, zipfile)
|
|
||||||
if os.path.exists(zipfile):
|
|
||||||
os.remove(zipfile)
|
|
||||||
logging.info('Compressing index into %s, tmpDir %s', zipfile, tmp_dir)
|
|
||||||
olddir = os.getcwd()
|
|
||||||
os.chdir(tmp_dir)
|
|
||||||
subprocess.check_call('zip -r %s %s' % (zipfile, directory), shell=True)
|
|
||||||
os.chdir(olddir)
|
|
||||||
|
|
||||||
|
|
||||||
def parse_config():
|
|
||||||
parser = argparse.ArgumentParser(description='Builds an elasticsearch index for backwards compatibility tests')
|
|
||||||
required = parser.add_mutually_exclusive_group(required=True)
|
|
||||||
required.add_argument('versions', metavar='X.Y.Z', nargs='*', default=[],
|
|
||||||
help='The elasticsearch version to build an index for')
|
|
||||||
required.add_argument('--all', action='store_true', default=False,
|
|
||||||
help='Recreate all existing backwards compatibility indexes')
|
|
||||||
parser.add_argument('--releases-dir', '-d', default='backwards', metavar='DIR',
|
|
||||||
help='The directory containing elasticsearch releases')
|
|
||||||
parser.add_argument('--output-dir', '-o', default='plugin/src/test/resources/indices/bwc/',
|
|
||||||
help='The directory to write the zipped index into')
|
|
||||||
|
|
||||||
cfg = parser.parse_args()
|
|
||||||
|
|
||||||
if not os.path.exists(cfg.output_dir):
|
|
||||||
parser.error('Output directory does not exist: %s' % cfg.output_dir)
|
|
||||||
|
|
||||||
if not cfg.versions:
|
|
||||||
# --all
|
|
||||||
for bwc_index in glob.glob(os.path.join(cfg.output_dir, 'x-pack-*.zip')):
|
|
||||||
version = os.path.basename(bwc_index)[len('x-pack-'):-len('.zip')]
|
|
||||||
cfg.versions.append(version)
|
|
||||||
|
|
||||||
return cfg
|
|
||||||
|
|
||||||
def shutdown_node(node):
|
|
||||||
logging.info('Shutting down node with pid %d', node.pid)
|
|
||||||
node.terminate()
|
|
||||||
node.wait()
|
|
||||||
|
|
||||||
def parse_version(version):
|
|
||||||
import re
|
|
||||||
splitted = re.split('[.-]', version)
|
|
||||||
if len(splitted) == 3:
|
|
||||||
splitted = splitted + ['GA']
|
|
||||||
splitted = [s.lower() for s in splitted]
|
|
||||||
assert len(splitted) == 4;
|
|
||||||
return splitted
|
|
||||||
|
|
||||||
def run(command, env_vars=None):
|
|
||||||
if env_vars:
|
|
||||||
for key, value in env_vars.items():
|
|
||||||
os.putenv(key, value)
|
|
||||||
logging.info('*** Running: %s%s%s' % (COLOR_OK, command, COLOR_END))
|
|
||||||
if os.system(command):
|
|
||||||
raise RuntimeError(' FAILED: %s' % (command))
|
|
||||||
|
|
||||||
assert parse_version('1.2.3') < parse_version('2.1.0')
|
|
||||||
assert parse_version('1.2.3') < parse_version('1.2.4')
|
|
||||||
assert parse_version('1.1.0') < parse_version('1.2.0')
|
|
||||||
|
|
||||||
# console colors
|
|
||||||
COLOR_OK = '\033[92m'
|
|
||||||
COLOR_END = '\033[0m'
|
|
||||||
COLOR_FAIL = '\033[91m'
|
|
||||||
|
|
||||||
def main():
|
|
||||||
logging.basicConfig(format='[%(levelname)s] [%(asctime)s] %(message)s', level=logging.INFO,
|
|
||||||
datefmt='%Y-%m-%d %I:%M:%S %p')
|
|
||||||
logging.getLogger('elasticsearch').setLevel(logging.ERROR)
|
|
||||||
logging.getLogger('urllib3').setLevel(logging.WARN)
|
|
||||||
cfg = parse_config()
|
|
||||||
for version in cfg.versions:
|
|
||||||
logging.info('--> Creating x-pack index for %s' % version)
|
|
||||||
|
|
||||||
# setup for starting nodes
|
|
||||||
release_dir = os.path.join(cfg.releases_dir, 'elasticsearch-%s' % version)
|
|
||||||
if not os.path.exists(release_dir):
|
|
||||||
raise RuntimeError('ES version %s does not exist in %s' % (version, cfg.releases_dir))
|
|
||||||
tmp_dir = tempfile.mkdtemp()
|
|
||||||
data_dir = os.path.join(tmp_dir, 'data')
|
|
||||||
logging.info('Temp data dir: %s' % data_dir)
|
|
||||||
node = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
if parse_version(version) < parse_version('5.0.0'):
|
|
||||||
# Remove old plugins just in case any are around
|
|
||||||
remove_plugin(version, release_dir, 'marvel-agent')
|
|
||||||
remove_plugin(version, release_dir, 'watcher')
|
|
||||||
remove_plugin(version, release_dir, 'shield')
|
|
||||||
remove_plugin(version, release_dir, 'license')
|
|
||||||
# Remove the shield config too before fresh install
|
|
||||||
run('rm -rf %s' %(os.path.join(release_dir, 'config/shield')))
|
|
||||||
# Install plugins we'll need
|
|
||||||
install_plugin(version, release_dir, 'license')
|
|
||||||
install_plugin(version, release_dir, 'shield')
|
|
||||||
install_plugin(version, release_dir, 'watcher')
|
|
||||||
install_plugin(version, release_dir, 'marvel-agent')
|
|
||||||
# define the stuff we need to make the esadmin user
|
|
||||||
users_script = os.path.join(release_dir, 'bin/shield/esusers')
|
|
||||||
esadmin_role = 'admin'
|
|
||||||
else:
|
|
||||||
# Remove old plugins just in case any are around
|
|
||||||
remove_plugin(version, release_dir, 'x-pack')
|
|
||||||
# Remove the x-pack config too before fresh install
|
|
||||||
run('rm -rf %s' %(os.path.join(release_dir, 'config/x-pack')))
|
|
||||||
# Install plugins we'll need
|
|
||||||
install_plugin(version, release_dir, 'x-pack')
|
|
||||||
# define the stuff we need to make the esadmin user
|
|
||||||
users_script = os.path.join(release_dir, 'bin/x-pack/users')
|
|
||||||
esadmin_role = 'superuser'
|
|
||||||
|
|
||||||
# create admin
|
|
||||||
run('%s useradd es_admin -r %s -p 0123456789' %
|
|
||||||
(users_script, esadmin_role))
|
|
||||||
node = start_node(version, release_dir, data_dir)
|
|
||||||
|
|
||||||
# create a client that authenticates as es_admin
|
|
||||||
client = create_client()
|
|
||||||
if parse_version(version) < parse_version('2.3.0'):
|
|
||||||
logging.info('Version is ' + version + ' but shield supports native realm only from 2.3.0 on. Nothing to do for Shield.')
|
|
||||||
else:
|
|
||||||
generate_security_index(client, version)
|
|
||||||
generate_watcher_index(client, version)
|
|
||||||
wait_for_monitoring_index_to_fill(client, version)
|
|
||||||
|
|
||||||
shutdown_node(node)
|
|
||||||
node = None
|
|
||||||
compress_index(version, tmp_dir, cfg.output_dir)
|
|
||||||
finally:
|
|
||||||
|
|
||||||
if node is not None:
|
|
||||||
# This only happens if we've hit an exception:
|
|
||||||
shutdown_node(node)
|
|
||||||
shutil.rmtree(tmp_dir)
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
try:
|
|
||||||
main()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
logging.info('Caught keyboard interrupt, exiting...')
|
|
||||||
sys.exit(signal.SIGTERM) # exit code
|
|
|
@ -178,8 +178,14 @@ curl --cacert certs/ca/ca.crt -u elastic:PleaseChangeMe https://localhost:9200
|
||||||
all users:
|
all users:
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
|
WARNING: Windows users not running PowerShell will need to remove `\` and join lines in the snippet below.
|
||||||
["source","sh"]
|
["source","sh"]
|
||||||
----
|
----
|
||||||
docker exec es01 /bin/bash -c "bin/x-pack/setup-passwords auto --batch -Expack.ssl.certificate=x-pack/certificates/es01/es01.crt -Expack.ssl.certificate_authorities=x-pack/certificates/ca/ca.crt -Expack.ssl.key=x-pack/certificates/es01/es01.key --url https://localhost:9200"
|
docker exec es01 /bin/bash -c "bin/x-pack/setup-passwords \
|
||||||
|
auto --batch \
|
||||||
|
-Expack.ssl.certificate=x-pack/certificates/es01/es01.crt \
|
||||||
|
-Expack.ssl.certificate_authorities=x-pack/certificates/ca/ca.crt \
|
||||||
|
-Expack.ssl.key=x-pack/certificates/es01/es01.key \
|
||||||
|
--url https://localhost:9200"
|
||||||
----
|
----
|
||||||
--
|
--
|
||||||
|
|
|
@ -30,7 +30,6 @@ dependencyLicenses {
|
||||||
mapping from: /bc.*/, to: 'bouncycastle'
|
mapping from: /bc.*/, to: 'bouncycastle'
|
||||||
mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
|
mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
|
||||||
mapping from: /transport-netty.*/, to: 'elasticsearch'
|
mapping from: /transport-netty.*/, to: 'elasticsearch'
|
||||||
mapping from: /tribe.*/, to: 'elasticsearch'
|
|
||||||
mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
|
mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch'
|
||||||
mapping from: /server.*/, to: 'elasticsearch'
|
mapping from: /server.*/, to: 'elasticsearch'
|
||||||
mapping from: /jdbc-proto.*/, to: 'elasticsearch'
|
mapping from: /jdbc-proto.*/, to: 'elasticsearch'
|
||||||
|
|
|
@ -63,14 +63,14 @@ import org.elasticsearch.xpack.action.TransportXPackInfoAction;
|
||||||
import org.elasticsearch.xpack.action.TransportXPackUsageAction;
|
import org.elasticsearch.xpack.action.TransportXPackUsageAction;
|
||||||
import org.elasticsearch.xpack.action.XPackInfoAction;
|
import org.elasticsearch.xpack.action.XPackInfoAction;
|
||||||
import org.elasticsearch.xpack.action.XPackUsageAction;
|
import org.elasticsearch.xpack.action.XPackUsageAction;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.http.HttpSettings;
|
import org.elasticsearch.xpack.watcher.common.http.HttpSettings;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthFactory;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthFactory;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthRegistry;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthRegistry;
|
||||||
import org.elasticsearch.xpack.common.http.auth.basic.BasicAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.basic.BasicAuth;
|
||||||
import org.elasticsearch.xpack.common.http.auth.basic.BasicAuthFactory;
|
import org.elasticsearch.xpack.watcher.common.http.auth.basic.BasicAuthFactory;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.deprecation.Deprecation;
|
import org.elasticsearch.xpack.deprecation.Deprecation;
|
||||||
import org.elasticsearch.xpack.extensions.XPackExtension;
|
import org.elasticsearch.xpack.extensions.XPackExtension;
|
||||||
import org.elasticsearch.xpack.extensions.XPackExtensionsService;
|
import org.elasticsearch.xpack.extensions.XPackExtensionsService;
|
||||||
|
@ -82,19 +82,19 @@ import org.elasticsearch.xpack.ml.MachineLearning;
|
||||||
import org.elasticsearch.xpack.ml.MachineLearningFeatureSet;
|
import org.elasticsearch.xpack.ml.MachineLearningFeatureSet;
|
||||||
import org.elasticsearch.xpack.monitoring.Monitoring;
|
import org.elasticsearch.xpack.monitoring.Monitoring;
|
||||||
import org.elasticsearch.xpack.monitoring.MonitoringFeatureSet;
|
import org.elasticsearch.xpack.monitoring.MonitoringFeatureSet;
|
||||||
import org.elasticsearch.xpack.notification.email.Account;
|
import org.elasticsearch.xpack.watcher.notification.email.Account;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailService;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailService;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.DataAttachmentParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.DataAttachmentParser;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentParser;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentsParser;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.HttpEmailAttachementParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.HttpEmailAttachementParser;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.ReportingAttachmentParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.ReportingAttachmentParser;
|
||||||
import org.elasticsearch.xpack.notification.email.support.BodyPartSource;
|
import org.elasticsearch.xpack.watcher.notification.email.support.BodyPartSource;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatService;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatService;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraService;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraService;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyAccount;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyService;
|
||||||
import org.elasticsearch.xpack.notification.slack.SlackService;
|
import org.elasticsearch.xpack.watcher.notification.slack.SlackService;
|
||||||
import org.elasticsearch.xpack.rest.action.RestXPackInfoAction;
|
import org.elasticsearch.xpack.rest.action.RestXPackInfoAction;
|
||||||
import org.elasticsearch.xpack.rest.action.RestXPackUsageAction;
|
import org.elasticsearch.xpack.rest.action.RestXPackUsageAction;
|
||||||
import org.elasticsearch.xpack.security.InternalClient;
|
import org.elasticsearch.xpack.security.InternalClient;
|
||||||
|
|
|
@ -18,7 +18,7 @@ import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.security.authc.support.Hasher;
|
import org.elasticsearch.xpack.security.authc.support.Hasher;
|
||||||
import org.elasticsearch.xpack.security.support.Validation;
|
import org.elasticsearch.xpack.security.support.Validation;
|
||||||
import org.elasticsearch.xpack.security.user.User;
|
import org.elasticsearch.xpack.security.user.User;
|
||||||
import org.elasticsearch.xpack.common.xcontent.XContentUtils;
|
import org.elasticsearch.xpack.security.common.xcontent.XContentUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.CharBuffer;
|
import java.nio.CharBuffer;
|
||||||
|
|
|
@ -21,7 +21,7 @@ import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.security.authc.support.Hasher;
|
import org.elasticsearch.xpack.security.authc.support.Hasher;
|
||||||
import org.elasticsearch.xpack.security.support.Validation;
|
import org.elasticsearch.xpack.security.support.Validation;
|
||||||
import org.elasticsearch.xpack.security.user.User;
|
import org.elasticsearch.xpack.security.user.User;
|
||||||
import org.elasticsearch.xpack.common.xcontent.XContentUtils;
|
import org.elasticsearch.xpack.security.common.xcontent.XContentUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentHelper;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
||||||
import org.elasticsearch.xpack.common.xcontent.XContentUtils;
|
import org.elasticsearch.xpack.security.common.xcontent.XContentUtils;
|
||||||
import org.elasticsearch.xpack.security.support.MetadataUtils;
|
import org.elasticsearch.xpack.security.support.MetadataUtils;
|
||||||
import org.elasticsearch.xpack.security.support.Validation;
|
import org.elasticsearch.xpack.security.support.Validation;
|
||||||
|
|
||||||
|
|
|
@ -3,15 +3,10 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.xcontent;
|
package org.elasticsearch.xpack.security.common.xcontent;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.bytes.BytesReference;
|
|
||||||
import org.elasticsearch.common.collect.Tuple;
|
|
||||||
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
|
||||||
import org.elasticsearch.common.xcontent.XContentHelper;
|
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -62,42 +57,4 @@ public class XContentUtils {
|
||||||
}
|
}
|
||||||
return list.toArray(new String[list.size()]);
|
return list.toArray(new String[list.size()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO open this up in core
|
|
||||||
public static List<Object> readList(XContentParser parser, XContentParser.Token token) throws IOException {
|
|
||||||
List<Object> list = new ArrayList<>();
|
|
||||||
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
|
|
||||||
list.add(readValue(parser, token));
|
|
||||||
}
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO open this up in core
|
|
||||||
public static Object readValue(XContentParser parser, XContentParser.Token token) throws IOException {
|
|
||||||
if (token == XContentParser.Token.VALUE_NULL) {
|
|
||||||
return null;
|
|
||||||
} else if (token == XContentParser.Token.VALUE_STRING) {
|
|
||||||
return parser.text();
|
|
||||||
} else if (token == XContentParser.Token.VALUE_NUMBER) {
|
|
||||||
XContentParser.NumberType numberType = parser.numberType();
|
|
||||||
if (numberType == XContentParser.NumberType.INT) {
|
|
||||||
return parser.intValue();
|
|
||||||
} else if (numberType == XContentParser.NumberType.LONG) {
|
|
||||||
return parser.longValue();
|
|
||||||
} else if (numberType == XContentParser.NumberType.FLOAT) {
|
|
||||||
return parser.floatValue();
|
|
||||||
} else if (numberType == XContentParser.NumberType.DOUBLE) {
|
|
||||||
return parser.doubleValue();
|
|
||||||
}
|
|
||||||
} else if (token == XContentParser.Token.VALUE_BOOLEAN) {
|
|
||||||
return parser.booleanValue();
|
|
||||||
} else if (token == XContentParser.Token.START_OBJECT) {
|
|
||||||
return parser.map();
|
|
||||||
} else if (token == XContentParser.Token.START_ARRAY) {
|
|
||||||
return readList(parser, token);
|
|
||||||
} else if (token == XContentParser.Token.VALUE_EMBEDDED_OBJECT) {
|
|
||||||
return parser.binaryValue();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -49,15 +49,15 @@ import org.elasticsearch.threadpool.FixedExecutorBuilder;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
import org.elasticsearch.xpack.XPackPlugin;
|
import org.elasticsearch.xpack.XPackPlugin;
|
||||||
import org.elasticsearch.xpack.XPackSettings;
|
import org.elasticsearch.xpack.XPackSettings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailService;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailService;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentsParser;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatService;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatService;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraService;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraService;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyService;
|
||||||
import org.elasticsearch.xpack.notification.slack.SlackService;
|
import org.elasticsearch.xpack.watcher.notification.slack.SlackService;
|
||||||
import org.elasticsearch.xpack.security.InternalClient;
|
import org.elasticsearch.xpack.security.InternalClient;
|
||||||
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions;
|
package org.elasticsearch.xpack.watcher.actions;
|
||||||
|
|
||||||
import org.elasticsearch.common.collect.MapBuilder;
|
import org.elasticsearch.common.collect.MapBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailTemplate;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailTemplate;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.IncidentEvent;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessage;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessage;
|
||||||
import org.elasticsearch.xpack.watcher.actions.email.EmailAction;
|
import org.elasticsearch.xpack.watcher.actions.email.EmailAction;
|
||||||
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
||||||
import org.elasticsearch.xpack.watcher.actions.index.IndexAction;
|
import org.elasticsearch.xpack.watcher.actions.index.IndexAction;
|
||||||
|
|
|
@ -10,14 +10,14 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.secret.Secret;
|
import org.elasticsearch.xpack.watcher.common.secret.Secret;
|
||||||
import org.elasticsearch.xpack.notification.email.Authentication;
|
import org.elasticsearch.xpack.watcher.notification.email.Authentication;
|
||||||
import org.elasticsearch.xpack.notification.email.DataAttachment;
|
import org.elasticsearch.xpack.watcher.notification.email.DataAttachment;
|
||||||
import org.elasticsearch.xpack.notification.email.Email;
|
import org.elasticsearch.xpack.watcher.notification.email.Email;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailTemplate;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailTemplate;
|
||||||
import org.elasticsearch.xpack.notification.email.Profile;
|
import org.elasticsearch.xpack.watcher.notification.email.Profile;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachments;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachments;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentsParser;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams;
|
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser;
|
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser;
|
||||||
|
|
|
@ -8,11 +8,11 @@ package org.elasticsearch.xpack.watcher.actions.email;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailService;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailService;
|
||||||
import org.elasticsearch.xpack.notification.email.HtmlSanitizer;
|
import org.elasticsearch.xpack.watcher.notification.email.HtmlSanitizer;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentsParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentsParser;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,13 @@ package org.elasticsearch.xpack.watcher.actions.email;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.email.Attachment;
|
import org.elasticsearch.xpack.watcher.notification.email.Attachment;
|
||||||
import org.elasticsearch.xpack.notification.email.DataAttachment;
|
import org.elasticsearch.xpack.watcher.notification.email.DataAttachment;
|
||||||
import org.elasticsearch.xpack.notification.email.Email;
|
import org.elasticsearch.xpack.watcher.notification.email.Email;
|
||||||
import org.elasticsearch.xpack.notification.email.EmailService;
|
import org.elasticsearch.xpack.watcher.notification.email.EmailService;
|
||||||
import org.elasticsearch.xpack.notification.email.HtmlSanitizer;
|
import org.elasticsearch.xpack.watcher.notification.email.HtmlSanitizer;
|
||||||
import org.elasticsearch.xpack.notification.email.attachment.EmailAttachmentParser;
|
import org.elasticsearch.xpack.watcher.notification.email.attachment.EmailAttachmentParser;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions.hipchat;
|
package org.elasticsearch.xpack.watcher.actions.hipchat;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatAccount;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatAccount;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatService;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatService;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.SentMessages;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.SentMessages;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -11,10 +11,10 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.SentMessages;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.SentMessages;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,10 +8,10 @@ package org.elasticsearch.xpack.watcher.actions.hipchat;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatAccount;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatAccount;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatService;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions.jira;
|
package org.elasticsearch.xpack.watcher.actions.jira;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraAccount;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraAccount;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraIssue;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraIssue;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraService;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraService;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -11,8 +11,8 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraIssue;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraIssue;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,8 +8,8 @@ package org.elasticsearch.xpack.watcher.actions.jira;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.jira.JiraService;
|
import org.elasticsearch.xpack.watcher.notification.jira.JiraService;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,7 +8,7 @@ package org.elasticsearch.xpack.watcher.actions.logging;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -10,7 +10,7 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,7 +8,7 @@ package org.elasticsearch.xpack.watcher.actions.logging;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions.pagerduty;
|
package org.elasticsearch.xpack.watcher.actions.pagerduty;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.IncidentEvent;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyAccount;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyAccount;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyService;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.SentEvent;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.SentEvent;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -10,8 +10,8 @@ import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.IncidentEvent;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.IncidentEvent;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.SentEvent;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.SentEvent;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
|
@ -8,8 +8,8 @@ package org.elasticsearch.xpack.watcher.actions.pagerduty;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.pagerduty.PagerDutyService;
|
import org.elasticsearch.xpack.watcher.notification.pagerduty.PagerDutyService;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions.slack;
|
package org.elasticsearch.xpack.watcher.actions.slack;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.slack.SentMessages;
|
import org.elasticsearch.xpack.watcher.notification.slack.SentMessages;
|
||||||
import org.elasticsearch.xpack.notification.slack.SlackAccount;
|
import org.elasticsearch.xpack.watcher.notification.slack.SlackAccount;
|
||||||
import org.elasticsearch.xpack.notification.slack.SlackService;
|
import org.elasticsearch.xpack.watcher.notification.slack.SlackService;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessage;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessage;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -11,9 +11,9 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.notification.slack.SentMessages;
|
import org.elasticsearch.xpack.watcher.notification.slack.SentMessages;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessage;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessage;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,8 +8,8 @@ package org.elasticsearch.xpack.watcher.actions.slack;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.slack.SlackService;
|
import org.elasticsearch.xpack.watcher.notification.slack.SlackService;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
package org.elasticsearch.xpack.watcher.actions.webhook;
|
package org.elasticsearch.xpack.watcher.actions.webhook;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
import org.elasticsearch.xpack.watcher.actions.ExecutableAction;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
|
|
@ -9,9 +9,9 @@ import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.watcher.actions.Action;
|
import org.elasticsearch.xpack.watcher.actions.Action;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,10 +8,10 @@ package org.elasticsearch.xpack.watcher.actions.webhook;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
import org.elasticsearch.xpack.watcher.actions.ActionFactory;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.apache.http.Header;
|
import org.apache.http.Header;
|
||||||
import org.apache.http.HttpHeaders;
|
import org.apache.http.HttpHeaders;
|
||||||
|
@ -38,8 +38,8 @@ import org.elasticsearch.common.unit.ByteSizeValue;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.common.http.auth.ApplicableHttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.ApplicableHttpAuth;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthRegistry;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthRegistry;
|
||||||
import org.elasticsearch.xpack.common.socket.SocketAccess;
|
import org.elasticsearch.xpack.common.socket.SocketAccess;
|
||||||
import org.elasticsearch.xpack.ssl.SSLService;
|
import org.elasticsearch.xpack.ssl.SSLService;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
|
@ -16,8 +16,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.rest.RestUtils;
|
import org.elasticsearch.rest.RestUtils;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuth;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthRegistry;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthRegistry;
|
||||||
import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils;
|
import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils;
|
||||||
import org.elasticsearch.xpack.watcher.support.WatcherUtils;
|
import org.elasticsearch.xpack.watcher.support.WatcherUtils;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpHeaders;
|
import io.netty.handler.codec.http.HttpHeaders;
|
||||||
|
|
||||||
|
@ -18,10 +18,10 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.rest.RestUtils;
|
import org.elasticsearch.rest.RestUtils;
|
||||||
import org.elasticsearch.script.ScriptType;
|
import org.elasticsearch.script.ScriptType;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuth;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthRegistry;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthRegistry;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils;
|
import org.elasticsearch.xpack.watcher.support.WatcherDateTimeUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import io.netty.handler.codec.http.HttpHeaders;
|
import io.netty.handler.codec.http.HttpHeaders;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.unit.ByteSizeUnit;
|
import org.elasticsearch.common.unit.ByteSizeUnit;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http;
|
package org.elasticsearch.xpack.watcher.common.http;
|
||||||
|
|
||||||
import org.elasticsearch.common.unit.ByteSizeValue;
|
import org.elasticsearch.common.unit.ByteSizeValue;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth;
|
package org.elasticsearch.xpack.watcher.common.http.auth;
|
||||||
|
|
||||||
import org.apache.http.auth.AuthScope;
|
import org.apache.http.auth.AuthScope;
|
||||||
import org.apache.http.client.CredentialsProvider;
|
import org.apache.http.client.CredentialsProvider;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth;
|
package org.elasticsearch.xpack.watcher.common.http.auth;
|
||||||
|
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth;
|
package org.elasticsearch.xpack.watcher.common.http.auth;
|
||||||
|
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth;
|
package org.elasticsearch.xpack.watcher.common.http.auth;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
|
@ -3,12 +3,12 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth.basic;
|
package org.elasticsearch.xpack.watcher.common.http.auth.basic;
|
||||||
|
|
||||||
import org.apache.http.auth.AuthScope;
|
import org.apache.http.auth.AuthScope;
|
||||||
import org.apache.http.auth.UsernamePasswordCredentials;
|
import org.apache.http.auth.UsernamePasswordCredentials;
|
||||||
import org.apache.http.client.CredentialsProvider;
|
import org.apache.http.client.CredentialsProvider;
|
||||||
import org.elasticsearch.xpack.common.http.auth.ApplicableHttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.ApplicableHttpAuth;
|
||||||
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
||||||
|
|
||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
|
@ -3,14 +3,14 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth.basic;
|
package org.elasticsearch.xpack.watcher.common.http.auth.basic;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuth;
|
||||||
import org.elasticsearch.xpack.common.secret.Secret;
|
import org.elasticsearch.xpack.watcher.common.secret.Secret;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams;
|
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherParams;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser;
|
import org.elasticsearch.xpack.watcher.support.xcontent.WatcherXContentParser;
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.http.auth.basic;
|
package org.elasticsearch.xpack.watcher.common.http.auth.basic;
|
||||||
|
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthFactory;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthFactory;
|
||||||
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.secret;
|
package org.elasticsearch.xpack.watcher.common.secret;
|
||||||
|
|
||||||
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.stats;
|
package org.elasticsearch.xpack.watcher.common.stats;
|
||||||
|
|
||||||
import com.carrotsearch.hppc.ObjectLongHashMap;
|
import com.carrotsearch.hppc.ObjectLongHashMap;
|
||||||
import com.carrotsearch.hppc.cursors.ObjectLongCursor;
|
import com.carrotsearch.hppc.cursors.ObjectLongCursor;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.text;
|
package org.elasticsearch.xpack.watcher.common.text;
|
||||||
|
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.xcontent.ToXContent;
|
import org.elasticsearch.common.xcontent.ToXContent;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.common.text;
|
package org.elasticsearch.xpack.watcher.common.text;
|
||||||
|
|
||||||
import org.elasticsearch.common.component.AbstractComponent;
|
import org.elasticsearch.common.component.AbstractComponent;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||||
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
|
*/
|
||||||
|
package org.elasticsearch.xpack.watcher.common.xcontent;
|
||||||
|
|
||||||
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class XContentUtils {
|
||||||
|
|
||||||
|
private XContentUtils() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO open this up in core
|
||||||
|
public static Object readValue(XContentParser parser, XContentParser.Token token) throws IOException {
|
||||||
|
if (token == XContentParser.Token.VALUE_NULL) {
|
||||||
|
return null;
|
||||||
|
} else if (token == XContentParser.Token.VALUE_STRING) {
|
||||||
|
return parser.text();
|
||||||
|
} else if (token == XContentParser.Token.VALUE_NUMBER) {
|
||||||
|
XContentParser.NumberType numberType = parser.numberType();
|
||||||
|
if (numberType == XContentParser.NumberType.INT) {
|
||||||
|
return parser.intValue();
|
||||||
|
} else if (numberType == XContentParser.NumberType.LONG) {
|
||||||
|
return parser.longValue();
|
||||||
|
} else if (numberType == XContentParser.NumberType.FLOAT) {
|
||||||
|
return parser.floatValue();
|
||||||
|
} else if (numberType == XContentParser.NumberType.DOUBLE) {
|
||||||
|
return parser.doubleValue();
|
||||||
|
}
|
||||||
|
} else if (token == XContentParser.Token.VALUE_BOOLEAN) {
|
||||||
|
return parser.booleanValue();
|
||||||
|
} else if (token == XContentParser.Token.START_OBJECT) {
|
||||||
|
return parser.map();
|
||||||
|
} else if (token == XContentParser.Token.START_ARRAY) {
|
||||||
|
return parser.list();
|
||||||
|
} else if (token == XContentParser.Token.VALUE_EMBEDDED_OBJECT) {
|
||||||
|
return parser.binaryValue();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
|
@ -8,7 +8,7 @@ package org.elasticsearch.xpack.watcher.condition;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.xcontent.XContentUtils;
|
import org.elasticsearch.xpack.watcher.common.xcontent.XContentUtils;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath;
|
import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -8,7 +8,7 @@ package org.elasticsearch.xpack.watcher.condition;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.xcontent.XContentUtils;
|
import org.elasticsearch.xpack.watcher.common.xcontent.XContentUtils;
|
||||||
import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath;
|
import org.elasticsearch.xpack.watcher.support.xcontent.ObjectPath;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -33,7 +33,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
||||||
import org.elasticsearch.index.engine.DocumentMissingException;
|
import org.elasticsearch.index.engine.DocumentMissingException;
|
||||||
import org.elasticsearch.xpack.common.stats.Counters;
|
import org.elasticsearch.xpack.watcher.common.stats.Counters;
|
||||||
import org.elasticsearch.xpack.watcher.Watcher;
|
import org.elasticsearch.xpack.watcher.Watcher;
|
||||||
import org.elasticsearch.xpack.watcher.actions.ActionWrapper;
|
import org.elasticsearch.xpack.watcher.actions.ActionWrapper;
|
||||||
import org.elasticsearch.xpack.watcher.condition.Condition;
|
import org.elasticsearch.xpack.watcher.condition.Condition;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
package org.elasticsearch.xpack.watcher.input;
|
package org.elasticsearch.xpack.watcher.input;
|
||||||
|
|
||||||
import org.elasticsearch.common.collect.MapBuilder;
|
import org.elasticsearch.common.collect.MapBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.watcher.input.chain.ChainInput;
|
import org.elasticsearch.xpack.watcher.input.chain.ChainInput;
|
||||||
import org.elasticsearch.xpack.watcher.input.http.HttpInput;
|
import org.elasticsearch.xpack.watcher.input.http.HttpInput;
|
||||||
import org.elasticsearch.xpack.watcher.input.none.NoneInput;
|
import org.elasticsearch.xpack.watcher.input.none.NoneInput;
|
||||||
|
|
|
@ -12,10 +12,10 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
import org.elasticsearch.xpack.watcher.input.ExecutableInput;
|
import org.elasticsearch.xpack.watcher.input.ExecutableInput;
|
||||||
import org.elasticsearch.xpack.watcher.support.Variables;
|
import org.elasticsearch.xpack.watcher.support.Variables;
|
||||||
|
|
|
@ -10,9 +10,9 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpContentType;
|
import org.elasticsearch.xpack.watcher.common.http.HttpContentType;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.watcher.input.Input;
|
import org.elasticsearch.xpack.watcher.input.Input;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,9 @@ package org.elasticsearch.xpack.watcher.input.http;
|
||||||
import org.elasticsearch.common.logging.Loggers;
|
import org.elasticsearch.common.logging.Loggers;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.input.InputFactory;
|
import org.elasticsearch.xpack.watcher.input.InputFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification;
|
package org.elasticsearch.xpack.watcher.notification;
|
||||||
|
|
||||||
import org.elasticsearch.common.collect.Tuple;
|
import org.elasticsearch.common.collect.Tuple;
|
||||||
import org.elasticsearch.common.component.AbstractComponent;
|
import org.elasticsearch.common.component.AbstractComponent;
|
|
@ -3,11 +3,10 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.SpecialPermission;
|
import org.elasticsearch.SpecialPermission;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
@ -24,7 +23,6 @@ import java.security.AccessController;
|
||||||
import java.security.PrivilegedAction;
|
import java.security.PrivilegedAction;
|
||||||
import java.security.PrivilegedActionException;
|
import java.security.PrivilegedActionException;
|
||||||
import java.security.PrivilegedExceptionAction;
|
import java.security.PrivilegedExceptionAction;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
public class Account {
|
public class Account {
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.common.SuppressForbidden;
|
import org.elasticsearch.common.SuppressForbidden;
|
||||||
|
@ -12,7 +12,7 @@ import org.elasticsearch.common.inject.Provider;
|
||||||
import org.elasticsearch.common.xcontent.ToXContent;
|
import org.elasticsearch.common.xcontent.ToXContent;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.notification.email.support.BodyPartSource;
|
import org.elasticsearch.xpack.watcher.notification.email.support.BodyPartSource;
|
||||||
|
|
||||||
import javax.activation.DataHandler;
|
import javax.activation.DataHandler;
|
||||||
import javax.activation.DataSource;
|
import javax.activation.DataSource;
|
|
@ -3,9 +3,9 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.xpack.common.secret.Secret;
|
import org.elasticsearch.xpack.watcher.common.secret.Secret;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
|
@ -3,11 +3,10 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.ToXContent;
|
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
|
@ -3,13 +3,13 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.settings.ClusterSettings;
|
import org.elasticsearch.common.settings.ClusterSettings;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.notification.NotificationService;
|
import org.elasticsearch.xpack.watcher.notification.NotificationService;
|
||||||
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
import org.elasticsearch.xpack.security.crypto.CryptoService;
|
||||||
|
|
||||||
import javax.mail.MessagingException;
|
import javax.mail.MessagingException;
|
|
@ -3,14 +3,14 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
|
|
||||||
import javax.mail.internet.AddressException;
|
import javax.mail.internet.AddressException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,9 +3,8 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import org.elasticsearch.common.Strings;
|
|
||||||
import org.elasticsearch.common.SuppressForbidden;
|
import org.elasticsearch.common.SuppressForbidden;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.owasp.html.CssSchema;
|
import org.owasp.html.CssSchema;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email;
|
package org.elasticsearch.xpack.watcher.notification.email;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
|
|
||||||
|
@ -13,21 +13,21 @@ import java.util.Objects;
|
||||||
public class DataAttachment implements EmailAttachmentParser.EmailAttachment {
|
public class DataAttachment implements EmailAttachmentParser.EmailAttachment {
|
||||||
|
|
||||||
private final String id;
|
private final String id;
|
||||||
private final org.elasticsearch.xpack.notification.email.DataAttachment dataAttachment;
|
private final org.elasticsearch.xpack.watcher.notification.email.DataAttachment dataAttachment;
|
||||||
|
|
||||||
public DataAttachment(String id, org.elasticsearch.xpack.notification.email.DataAttachment dataAttachment) {
|
public DataAttachment(String id, org.elasticsearch.xpack.watcher.notification.email.DataAttachment dataAttachment) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.dataAttachment = dataAttachment;
|
this.dataAttachment = dataAttachment;
|
||||||
}
|
}
|
||||||
|
|
||||||
public org.elasticsearch.xpack.notification.email.DataAttachment getDataAttachment() {
|
public org.elasticsearch.xpack.watcher.notification.email.DataAttachment getDataAttachment() {
|
||||||
return dataAttachment;
|
return dataAttachment;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
|
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
|
||||||
builder.startObject(id).startObject(DataAttachmentParser.TYPE);
|
builder.startObject(id).startObject(DataAttachmentParser.TYPE);
|
||||||
if (dataAttachment == org.elasticsearch.xpack.notification.email.DataAttachment.YAML) {
|
if (dataAttachment == org.elasticsearch.xpack.watcher.notification.email.DataAttachment.YAML) {
|
||||||
builder.field("format", "yaml");
|
builder.field("format", "yaml");
|
||||||
} else {
|
} else {
|
||||||
builder.field("format", "json");
|
builder.field("format", "json");
|
||||||
|
@ -72,13 +72,13 @@ public class DataAttachment implements EmailAttachmentParser.EmailAttachment {
|
||||||
public static class Builder {
|
public static class Builder {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
private org.elasticsearch.xpack.notification.email.DataAttachment dataAttachment;
|
private org.elasticsearch.xpack.watcher.notification.email.DataAttachment dataAttachment;
|
||||||
|
|
||||||
private Builder(String id) {
|
private Builder(String id) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Builder dataAttachment(org.elasticsearch.xpack.notification.email.DataAttachment dataAttachment) {
|
public Builder dataAttachment(org.elasticsearch.xpack.watcher.notification.email.DataAttachment dataAttachment) {
|
||||||
this.dataAttachment = dataAttachment;
|
this.dataAttachment = dataAttachment;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
|
@ -3,21 +3,21 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.notification.email.Attachment;
|
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
|
import org.elasticsearch.xpack.watcher.notification.email.Attachment;
|
||||||
import org.elasticsearch.xpack.watcher.support.Variables;
|
import org.elasticsearch.xpack.watcher.support.Variables;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static org.elasticsearch.xpack.notification.email.DataAttachment.resolve;
|
import static org.elasticsearch.xpack.watcher.notification.email.DataAttachment.resolve;
|
||||||
|
|
||||||
public class DataAttachmentParser implements EmailAttachmentParser<DataAttachment> {
|
public class DataAttachmentParser implements EmailAttachmentParser<DataAttachment> {
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@ public class DataAttachmentParser implements EmailAttachmentParser<DataAttachmen
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DataAttachment parse(String id, XContentParser parser) throws IOException {
|
public DataAttachment parse(String id, XContentParser parser) throws IOException {
|
||||||
org.elasticsearch.xpack.notification.email.DataAttachment dataAttachment =
|
org.elasticsearch.xpack.watcher.notification.email.DataAttachment dataAttachment =
|
||||||
org.elasticsearch.xpack.notification.email.DataAttachment.YAML;
|
org.elasticsearch.xpack.watcher.notification.email.DataAttachment.YAML;
|
||||||
|
|
||||||
String currentFieldName = null;
|
String currentFieldName = null;
|
||||||
XContentParser.Token token;
|
XContentParser.Token token;
|
|
@ -3,11 +3,11 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.common.xcontent.ToXContentFragment;
|
import org.elasticsearch.common.xcontent.ToXContentFragment;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.notification.email.Attachment;
|
import org.elasticsearch.xpack.watcher.notification.email.Attachment;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentFragment;
|
import org.elasticsearch.common.xcontent.ToXContentFragment;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
|
@ -11,12 +11,12 @@ import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.bytes.BytesReference;
|
import org.elasticsearch.common.bytes.BytesReference;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.email.Attachment;
|
import org.elasticsearch.xpack.watcher.notification.email.Attachment;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
import org.elasticsearch.xpack.watcher.support.Variables;
|
import org.elasticsearch.xpack.watcher.support.Variables;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
|
@ -3,12 +3,12 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
|
@ -3,14 +3,14 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuth;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.attachment;
|
package org.elasticsearch.xpack.watcher.notification.email.attachment;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
|
@ -19,17 +19,17 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||||
import org.elasticsearch.common.xcontent.ObjectParser;
|
import org.elasticsearch.common.xcontent.ObjectParser;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequestTemplate;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequestTemplate;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuth;
|
||||||
import org.elasticsearch.xpack.common.http.auth.HttpAuthRegistry;
|
import org.elasticsearch.xpack.watcher.common.http.auth.HttpAuthRegistry;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.email.Attachment;
|
import org.elasticsearch.xpack.watcher.notification.email.Attachment;
|
||||||
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
import org.elasticsearch.xpack.watcher.execution.WatchExecutionContext;
|
||||||
import org.elasticsearch.xpack.watcher.support.Variables;
|
import org.elasticsearch.xpack.watcher.support.Variables;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.email.support;
|
package org.elasticsearch.xpack.watcher.notification.email.support;
|
||||||
|
|
||||||
import org.elasticsearch.SpecialPermission;
|
import org.elasticsearch.SpecialPermission;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
|
@ -3,16 +3,16 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
|
@ -12,8 +12,8 @@ import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
|
@ -3,10 +3,10 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
|
|
||||||
public class HipChatServer {
|
public class HipChatServer {
|
||||||
|
|
|
@ -3,14 +3,14 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.ClusterSettings;
|
import org.elasticsearch.common.settings.ClusterSettings;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.notification.NotificationService;
|
import org.elasticsearch.xpack.watcher.notification.NotificationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A component to store hipchat credentials.
|
* A component to store hipchat credentials.
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
|
@ -11,16 +11,16 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color;
|
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format;
|
|
||||||
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Color;
|
||||||
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Format;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
|
@ -3,15 +3,15 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
|
@ -11,15 +11,15 @@ import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Color;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Format;
|
||||||
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,22 +3,22 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.hipchat;
|
package org.elasticsearch.xpack.watcher.notification.hipchat;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Color;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Color;
|
||||||
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage.Format;
|
import org.elasticsearch.xpack.watcher.notification.hipchat.HipChatMessage.Format;
|
||||||
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.jira;
|
package org.elasticsearch.xpack.watcher.notification.jira;
|
||||||
|
|
||||||
import org.elasticsearch.common.Booleans;
|
import org.elasticsearch.common.Booleans;
|
||||||
import org.elasticsearch.common.Strings;
|
import org.elasticsearch.common.Strings;
|
||||||
|
@ -13,13 +13,13 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||||
import org.elasticsearch.common.xcontent.ToXContent;
|
import org.elasticsearch.common.xcontent.ToXContent;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentType;
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
import org.elasticsearch.xpack.common.http.auth.basic.BasicAuth;
|
import org.elasticsearch.xpack.watcher.common.http.auth.basic.BasicAuth;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UncheckedIOException;
|
import java.io.UncheckedIOException;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.jira;
|
package org.elasticsearch.xpack.watcher.notification.jira;
|
||||||
|
|
||||||
import org.apache.http.HttpStatus;
|
import org.apache.http.HttpStatus;
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
|
@ -14,8 +14,8 @@ import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.watcher.actions.jira.JiraAction;
|
import org.elasticsearch.xpack.watcher.actions.jira.JiraAction;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,13 +3,13 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.jira;
|
package org.elasticsearch.xpack.watcher.notification.jira;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.ClusterSettings;
|
import org.elasticsearch.common.settings.ClusterSettings;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.notification.NotificationService;
|
import org.elasticsearch.xpack.watcher.notification.NotificationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A component to store Atlassian's JIRA credentials.
|
* A component to store Atlassian's JIRA credentials.
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
|
@ -13,12 +13,12 @@ import org.elasticsearch.common.xcontent.ToXContent;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
|
@ -12,8 +12,8 @@ import org.elasticsearch.common.Strings;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplate;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||||
import org.elasticsearch.xpack.common.text.TextTemplateEngine;
|
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
|
|
|
@ -3,14 +3,14 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.watcher.watch.Payload;
|
import org.elasticsearch.xpack.watcher.watch.Payload;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,13 +3,13 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.ClusterSettings;
|
import org.elasticsearch.common.settings.ClusterSettings;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.notification.NotificationService;
|
import org.elasticsearch.xpack.watcher.notification.NotificationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A component to store pagerduty credentials.
|
* A component to store pagerduty credentials.
|
|
@ -3,7 +3,7 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.pagerduty;
|
package org.elasticsearch.xpack.watcher.notification.pagerduty;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchParseException;
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
|
@ -13,8 +13,8 @@ import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
import org.elasticsearch.common.xcontent.json.JsonXContent;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction;
|
import org.elasticsearch.xpack.watcher.actions.pagerduty.PagerDutyAction;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
|
@ -3,16 +3,16 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.slack;
|
package org.elasticsearch.xpack.watcher.notification.slack;
|
||||||
|
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.common.Nullable;
|
import org.elasticsearch.common.Nullable;
|
||||||
import org.elasticsearch.common.ParseField;
|
import org.elasticsearch.common.ParseField;
|
||||||
import org.elasticsearch.common.xcontent.ToXContentObject;
|
import org.elasticsearch.common.xcontent.ToXContentObject;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessage;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessage;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
|
@ -3,23 +3,22 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.slack;
|
package org.elasticsearch.xpack.watcher.notification.slack;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.elasticsearch.ExceptionsHelper;
|
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.settings.SettingsException;
|
import org.elasticsearch.common.settings.SettingsException;
|
||||||
import org.elasticsearch.common.xcontent.ToXContent;
|
import org.elasticsearch.common.xcontent.ToXContent;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.common.http.HttpMethod;
|
import org.elasticsearch.xpack.watcher.common.http.HttpMethod;
|
||||||
import org.elasticsearch.xpack.common.http.HttpProxy;
|
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||||
import org.elasticsearch.xpack.common.http.HttpRequest;
|
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||||
import org.elasticsearch.xpack.common.http.HttpResponse;
|
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||||
import org.elasticsearch.xpack.common.http.Scheme;
|
import org.elasticsearch.xpack.watcher.common.http.Scheme;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.Attachment;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.Attachment;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessage;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessage;
|
||||||
import org.elasticsearch.xpack.notification.slack.message.SlackMessageDefaults;
|
import org.elasticsearch.xpack.watcher.notification.slack.message.SlackMessageDefaults;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
|
@ -3,13 +3,13 @@
|
||||||
* or more contributor license agreements. Licensed under the Elastic License;
|
* or more contributor license agreements. Licensed under the Elastic License;
|
||||||
* you may not use this file except in compliance with the Elastic License.
|
* you may not use this file except in compliance with the Elastic License.
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.xpack.notification.slack;
|
package org.elasticsearch.xpack.watcher.notification.slack;
|
||||||
|
|
||||||
import org.elasticsearch.common.settings.ClusterSettings;
|
import org.elasticsearch.common.settings.ClusterSettings;
|
||||||
import org.elasticsearch.common.settings.Setting;
|
import org.elasticsearch.common.settings.Setting;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.xpack.common.http.HttpClient;
|
import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
||||||
import org.elasticsearch.xpack.notification.NotificationService;
|
import org.elasticsearch.xpack.watcher.notification.NotificationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A component to store slack credentials.
|
* A component to store slack credentials.
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue