Repository: ambari Updated Branches: refs/heads/trunk cbb1e9059 -> fd4a7a46a
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java new file mode 100644 index 0000000..5c547ad --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.InputDescriptor; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public class LSServerInputFile extends LSServerInputFileBase { + public LSServerInputFile(InputDescriptor inputDescriptor) { + super(inputDescriptor); + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java new file mode 100644 index 0000000..df21d0d --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.InputDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.InputFileBaseDescriptor; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public abstract class LSServerInputFileBase extends LSServerInput { + @JsonProperty("checkpoint_interval_ms") + private Integer checkpointIntervalMs; + + @JsonProperty("process_file") + private Boolean processFile; + + @JsonProperty("copy_file") + private Boolean copyFile; + + public LSServerInputFileBase(InputDescriptor inputDescriptor) { + super(inputDescriptor); + + InputFileBaseDescriptor inputFileBaseDescriptor = (InputFileBaseDescriptor)inputDescriptor; + this.checkpointIntervalMs = inputFileBaseDescriptor.getCheckpointIntervalMs(); + this.processFile = inputFileBaseDescriptor.getProcessFile(); + this.copyFile = inputFileBaseDescriptor.getCopyFile(); + } + + public Integer getCheckpointIntervalMs() { + return checkpointIntervalMs; + } + + public void setCheckpointIntervalMs(Integer checkpointIntervalMs) { + this.checkpointIntervalMs = checkpointIntervalMs; + } + + public Boolean getProcessFile() { + return processFile; + } + + public void setProcessFile(Boolean processFile) { + this.processFile = processFile; + } + + public Boolean getCopyFile() { + return copyFile; + } + + public void setCopyFile(Boolean copyFile) { + this.copyFile = copyFile; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputS3File.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputS3File.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputS3File.java new file mode 100644 index 0000000..8e9acf0 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputS3File.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.InputDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.InputS3FileDescriptor; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public class LSServerInputS3File extends LSServerInputFileBase { + @JsonProperty("s3_access_key") + private String s3AccessKey; + + @JsonProperty("s3_secret_key") + private String s3SecretKey; + + public LSServerInputS3File(InputDescriptor inputDescriptor) { + super(inputDescriptor); + InputS3FileDescriptor inputS3FileDescriptor = (InputS3FileDescriptor)inputDescriptor; + this.s3AccessKey = inputS3FileDescriptor.getS3AccessKey(); + this.s3SecretKey = inputS3FileDescriptor.getS3SecretKey(); + } + + public String getS3AccessKey() { + return s3AccessKey; + } + + public void setS3AccessKey(String s3AccessKey) { + this.s3AccessKey = s3AccessKey; + } + + public String getS3SecretKey() { + return s3SecretKey; + } + + public void setS3SecretKey(String s3SecretKey) { + this.s3SecretKey = s3SecretKey; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapDate.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapDate.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapDate.java new file mode 100644 index 0000000..dcacceb --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapDate.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapDateDescriptor; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonInclude.Include; + +@JsonInclude(Include.NON_NULL) +public class LSServerMapDate extends LSServerMapField { + @Override + public String getName() { + return "map_date"; + } + + @JsonProperty("source_date_pattern") + private String sourceDatePattern; + + @JsonProperty("target_date_pattern") + private String targetDatePattern; + + public LSServerMapDate(MapDateDescriptor mapDateDescriptor) { + this.sourceDatePattern = mapDateDescriptor.getSourceDatePattern(); + this.targetDatePattern = mapDateDescriptor.getTargetDatePattern(); + } + + public String getSourceDatePattern() { + return sourceDatePattern; + } + + public void setSourceDatePattern(String sourceDatePattern) { + this.sourceDatePattern = sourceDatePattern; + } + + public String getTargetDatePattern() { + return targetDatePattern; + } + + public void setTargetDatePattern(String targetDatePattern) { + this.targetDatePattern = targetDatePattern; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapField.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapField.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapField.java new file mode 100644 index 0000000..b18439c --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapField.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import io.swagger.annotations.ApiModel; + +@ApiModel +@JsonIgnoreProperties(value = { "name" }) +public abstract class LSServerMapField { + public abstract String getName(); +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldCopy.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldCopy.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldCopy.java new file mode 100644 index 0000000..b0bea83 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldCopy.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldCopyDescriptor; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public class LSServerMapFieldCopy extends LSServerMapField { + @Override + public String getName() { + return "map_fieldcopy"; + } + + @JsonProperty("copy_name") + private String copyName; + + public LSServerMapFieldCopy(MapFieldCopyDescriptor mapFieldCopyDescriptor) { + this.copyName = mapFieldCopyDescriptor.getCopyName(); + } + + public String getCopyName() { + return copyName; + } + + public void setCopyName(String copyName) { + this.copyName = copyName; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldName.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldName.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldName.java new file mode 100644 index 0000000..000b29d --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldName.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldNameDescriptor; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public class LSServerMapFieldName extends LSServerMapField { + @Override + public String getName() { + return "map_fieldname"; + } + + @JsonProperty("new_field_name") + private String newFieldName; + + public LSServerMapFieldName(MapFieldNameDescriptor mapFieldNameDescriptor) { + this.newFieldName = mapFieldNameDescriptor.getNewFieldName(); + } + + public String getNewFieldName() { + return newFieldName; + } + + public void setNewFieldName(String newFieldName) { + this.newFieldName = newFieldName; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldValue.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldValue.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldValue.java new file mode 100644 index 0000000..6152de5 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerMapFieldValue.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldValueDescriptor; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.swagger.annotations.ApiModel; + +@ApiModel +public class LSServerMapFieldValue extends LSServerMapField { + @Override + public String getName() { + return "map_fieldvalue"; + } + + @JsonProperty("pre_value") + private String preValue; + + @JsonProperty("post_value") + private String postValue; + + public LSServerMapFieldValue(MapFieldValueDescriptor mapFieldValueDescriptor) { + this.preValue = mapFieldValueDescriptor.getPreValue(); + this.postValue = mapFieldValueDescriptor.getPostValue(); + } + + public String getPreValue() { + return preValue; + } + + public void setPreValue(String preValue) { + this.preValue = preValue; + } + + public String getPostValue() { + return postValue; + } + + public void setPostValue(String postValue) { + this.postValue = postValue; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValues.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValues.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValues.java new file mode 100644 index 0000000..5f361c9 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValues.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapDateDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldCopyDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldNameDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.MapFieldValueDescriptor; +import org.apache.ambari.logsearch.config.api.model.inputconfig.PostMapValues; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import io.swagger.annotations.ApiModel; + +@ApiModel +@JsonSerialize(using = LSServerPostMapValuesSerializer.class) +public class LSServerPostMapValues { + private List<LSServerMapField> mappers; + + public LSServerPostMapValues(PostMapValues pmv) { + mappers = new ArrayList<>(); + for (MapFieldDescriptor mapFieldDescriptor : pmv.getMappers()) { + if (mapFieldDescriptor instanceof MapDateDescriptor) { + mappers.add(new LSServerMapDate((MapDateDescriptor)mapFieldDescriptor)); + } else if (mapFieldDescriptor instanceof MapFieldCopyDescriptor) { + mappers.add(new LSServerMapFieldCopy((MapFieldCopyDescriptor)mapFieldDescriptor)); + } else if (mapFieldDescriptor instanceof MapFieldNameDescriptor) { + mappers.add(new LSServerMapFieldName((MapFieldNameDescriptor)mapFieldDescriptor)); + } else if (mapFieldDescriptor instanceof MapFieldValueDescriptor) { + mappers.add(new LSServerMapFieldValue((MapFieldValueDescriptor)mapFieldDescriptor)); + } + } + } + + public List<LSServerMapField> getMappers() { + return mappers; + } + + public void setMappers(List<LSServerMapField> mappers) { + this.mappers = mappers; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValuesSerializer.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValuesSerializer.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValuesSerializer.java new file mode 100644 index 0000000..7543677 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerPostMapValuesSerializer.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.ambari.logsearch.model.common; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +public class LSServerPostMapValuesSerializer extends JsonSerializer<LSServerPostMapValues> { + @Override + public void serialize(LSServerPostMapValues value, JsonGenerator jgen, SerializerProvider provider) + throws IOException, JsonProcessingException { + jgen.writeStartObject(); + for (LSServerMapField mapField : value.getMappers()) { + jgen.writeObjectField(mapField.getName(), mapField); + } + jgen.writeEndObject(); + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/ShipperConfigResource.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/ShipperConfigResource.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/ShipperConfigResource.java index 342d1cf..a7d99c9 100644 --- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/ShipperConfigResource.java +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/ShipperConfigResource.java @@ -33,6 +33,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.ambari.logsearch.manager.ShipperConfigManager; +import org.apache.ambari.logsearch.model.common.LSServerInputConfig; import org.apache.ambari.logsearch.model.common.LSServerLogLevelFilterMap; import org.springframework.context.annotation.Scope; @@ -65,7 +66,8 @@ public class ShipperConfigResource { @Path("/input/{clusterName}/services/{serviceName}") @Produces({"application/json"}) @ApiOperation(GET_SHIPPER_CONFIG_OD) - public String getShipperConfig(@PathParam("clusterName") String clusterName, @PathParam("serviceName") String serviceName) { + public LSServerInputConfig getShipperConfig(@PathParam("clusterName") String clusterName, @PathParam("serviceName") + String serviceName) { return shipperConfigManager.getInputConfig(clusterName, serviceName); } @@ -99,7 +101,7 @@ public class ShipperConfigResource { @Path("/filters/{clusterName}/level") @Produces({"application/json"}) @ApiOperation(UPDATE_LOG_LEVEL_FILTER_OD) - public Response setogLevelFilter(LSServerLogLevelFilterMap request, @PathParam("clusterName") String clusterName) { + public Response setLogLevelFilter(LSServerLogLevelFilterMap request, @PathParam("clusterName") String clusterName) { return shipperConfigManager.setLogLevelFilters(clusterName, request); } http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties b/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties index d171803..fb7ddf2 100644 --- a/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties +++ b/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties @@ -29,3 +29,4 @@ logfeeder.cache.key.field=log_message logfeeder.cache.dedup.interval=1000 logfeeder.cache.last.dedup.enabled=true logsearch.config.zk_connect_string=localhost:9983 +logfeeder.include.default.level=FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/docker/test-config/logsearch/logsearch.properties ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/test-config/logsearch/logsearch.properties b/ambari-logsearch/docker/test-config/logsearch/logsearch.properties index 684d1dc..5bde17c 100644 --- a/ambari-logsearch/docker/test-config/logsearch/logsearch.properties +++ b/ambari-logsearch/docker/test-config/logsearch/logsearch.properties @@ -43,10 +43,6 @@ logsearch.collection.history.replication.factor=1 logsearch.solr.metrics.collector.hosts= logsearch.solr.jmx.port=18886 -# Logfeeder Settings - -logsearch.logfeeder.include.default.level=FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN - # logsearch-admin.json logsearch.auth.file.enable=true logsearch.login.credentials.file=user_pass.json
