Fix issue that nothing is in 'Time field' dropdown when defining moni…

…tors by visual graph (#222) * correct the mistake in ES API calls of 'get alias, indices and mappings' during migration * add validation for api routers of ES API calls of 'get alises, indices, and mappings'
opendistro-for-elasticsearch · Dec 9, 2020 · 777c137 · 777c137
1 parent 48e98ea
commit 777c137
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js b/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js
@@ -231,7 +231,7 @@ class DefineMonitor extends Component {
 
     try {
       const response = await this.props.httpClient.post('../api/alerting/_mappings', {
-        body: JSON.stringify(index),
+        body: JSON.stringify({ index }),
       });
       if (response.ok) {
         return response.resp;

diff --git a/public/pages/CreateMonitor/containers/MonitorIndex/MonitorIndex.js b/public/pages/CreateMonitor/containers/MonitorIndex/MonitorIndex.js
@@ -121,7 +121,7 @@ class MonitorIndex extends React.Component {
     }
     try {
       const response = await this.props.httpClient.post('../api/alerting/_indices', {
-        body: JSON.stringify(index),
+        body: JSON.stringify({ index }),
       });
       if (response.ok) {
         const indices = response.resp.map(({ health, index, status }) => ({
@@ -151,7 +151,7 @@ class MonitorIndex extends React.Component {
 
     try {
       const response = await this.props.httpClient.post('../api/alerting/_aliases', {
-        body: JSON.stringify(alias),
+        body: JSON.stringify({ alias }),
       });
       if (response.ok) {
         const indices = response.resp.map(({ alias, index }) => ({ label: alias, index }));

diff --git a/server/routes/elasticsearch.js b/server/routes/elasticsearch.js
@@ -32,7 +32,9 @@ export default function (services, router) {
     {
       path: '/api/alerting/_indices',
       validate: {
-        body: schema.any(),
+        body: schema.object({
+          index: schema.string(),
+        }),
       },
     },
     elasticsearchService.getIndices
@@ -42,7 +44,9 @@ export default function (services, router) {
     {
       path: '/api/alerting/_aliases',
       validate: {
-        body: schema.any(),
+        body: schema.object({
+          alias: schema.string(),
+        }),
       },
     },
     elasticsearchService.getAliases
@@ -52,7 +56,9 @@ export default function (services, router) {
     {
       path: '/api/alerting/_mappings',
       validate: {
-        body: schema.any(),
+        body: schema.object({
+          index: schema.arrayOf(schema.string()),
+        }),
       },
     },
     elasticsearchService.getMappings

diff --git a/server/services/ElasticsearchService.js b/server/services/ElasticsearchService.js
@@ -82,7 +82,7 @@ export default class ElasticsearchService {
   getAliases = async (context, req, res) => {
     try {
       const { alias } = req.body;
-      const { callAsCurrentUser } = this.esDriver.asScoped(res);
+      const { callAsCurrentUser } = this.esDriver.asScoped(req);
       const aliases = await callAsCurrentUser('cat.aliases', {
         alias,
         format: 'json',
@@ -107,9 +107,9 @@ export default class ElasticsearchService {
 
   getMappings = async (context, req, res) => {
     try {
-      const params = { body: JSON.stringify(req.body) };
+      const { index } = req.body;
       const { callAsCurrentUser } = this.esDriver.asScoped(req);
-      const mappings = await callAsCurrentUser('indices.getMapping', params);
+      const mappings = await callAsCurrentUser('indices.getMapping', { index });
       return res.ok({
         body: {
           ok: true,