diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/kafka/GELFKafkaInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/kafka/GELFKafkaInput.java index 08bdb851c6da..15647184038d 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/kafka/GELFKafkaInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/kafka/GELFKafkaInput.java @@ -52,12 +52,12 @@ public GELFKafkaInput(@Assisted Configuration configuration, protected GELFKafkaInput(MetricRegistry metricRegistry, Configuration configuration, - KafkaTransport radioKafkaTransport, + KafkaTransport kafkaTransport, GelfCodec codec, LocalMetricRegistry localRegistry, MessageInput.Config config, MessageInput.Descriptor descriptor, ServerStatus serverStatus) { - super(metricRegistry, configuration, radioKafkaTransport, localRegistry, codec, config, descriptor, serverStatus); + super(metricRegistry, configuration, kafkaTransport, localRegistry, codec, config, descriptor, serverStatus); } @FactoryClass diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/raw/kafka/RawKafkaInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/raw/kafka/RawKafkaInput.java index 5989c2f15cf8..79a848cb6513 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/raw/kafka/RawKafkaInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/raw/kafka/RawKafkaInput.java @@ -52,12 +52,12 @@ public RawKafkaInput(@Assisted Configuration configuration, protected RawKafkaInput(MetricRegistry metricRegistry, Configuration configuration, - KafkaTransport radioKafkaTransport, + KafkaTransport kafkaTransport, RawCodec codec, LocalMetricRegistry localRegistry, MessageInput.Config config, MessageInput.Descriptor descriptor, ServerStatus serverStatus) { - super(metricRegistry, configuration, radioKafkaTransport, localRegistry, codec, config, descriptor, serverStatus); + super(metricRegistry, configuration, kafkaTransport, localRegistry, codec, config, descriptor, serverStatus); } @FactoryClass diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/syslog/kafka/SyslogKafkaInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/syslog/kafka/SyslogKafkaInput.java index 525b49448a6a..2410935130e2 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/syslog/kafka/SyslogKafkaInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/syslog/kafka/SyslogKafkaInput.java @@ -52,12 +52,12 @@ public SyslogKafkaInput(@Assisted Configuration configuration, protected SyslogKafkaInput(MetricRegistry metricRegistry, Configuration configuration, - KafkaTransport radioKafkaTransport, + KafkaTransport kafkaTransport, SyslogCodec codec, LocalMetricRegistry localRegistry, MessageInput.Config config, MessageInput.Descriptor descriptor, ServerStatus serverStatus) { - super(metricRegistry, configuration, radioKafkaTransport, localRegistry, codec, config, descriptor, serverStatus); + super(metricRegistry, configuration, kafkaTransport, localRegistry, codec, config, descriptor, serverStatus); } @FactoryClass diff --git a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/GenericHost.java b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/GenericHost.java deleted file mode 100644 index 0c80052dcd32..000000000000 --- a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/GenericHost.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * The MIT License - * Copyright (c) 2012 Graylog, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.graylog2.plugin; - -/** - * @author Dennis Oelkers - */ -public interface GenericHost { - public boolean isProcessing(); - public boolean isServer(); - public boolean isRadio(); -} diff --git a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/api/results/MessageResult.java b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/api/results/MessageResult.java index 92a9108a4c93..9ea693f83260 100755 --- a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/api/results/MessageResult.java +++ b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/api/results/MessageResult.java @@ -173,10 +173,6 @@ public String getSourceInputId() { return sourceInputId; } - public boolean viaRadio() { - return sourceRadioId != null; - } - public String getSourceRadioId() { return sourceRadioId; } diff --git a/graylog2-rest-routes/src/main/java/org/graylog2/restroutes/GenerateRoutes.java b/graylog2-rest-routes/src/main/java/org/graylog2/restroutes/GenerateRoutes.java index 890de0a29bc6..c5ec9c74930e 100644 --- a/graylog2-rest-routes/src/main/java/org/graylog2/restroutes/GenerateRoutes.java +++ b/graylog2-rest-routes/src/main/java/org/graylog2/restroutes/GenerateRoutes.java @@ -32,10 +32,12 @@ */ package org.graylog2.restroutes; -import com.sun.codemodel.*; +import com.sun.codemodel.JClassAlreadyExistsException; +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JDefinedClass; import org.graylog2.restroutes.internal.ResourceRoutesParser; -import org.graylog2.restroutes.internal.RouteClassGenerator; import org.graylog2.restroutes.internal.RouteClass; +import org.graylog2.restroutes.internal.RouteClassGenerator; import org.graylog2.restroutes.internal.RouterGenerator; import org.graylog2.shared.rest.resources.RestResource; @@ -75,25 +77,6 @@ public static void main(String[] argv) { final RouterGenerator routerGenerator = new RouterGenerator(router, generator); routerGenerator.build(routeClassList); - // do the same for radio resources - JDefinedClass radioRouter = null; - try { - radioRouter = codeModel._class(packagePrefix + ".Radio"); - } catch (JClassAlreadyExistsException e) { - e.printStackTrace(); - System.exit(-1); - } - - final ResourceRoutesParser radioParser = new ResourceRoutesParser("org.graylog2.radio.rest.resources"); - final List radioRouteClassList = radioParser.buildClasses(); - radioRouteClassList.addAll(sharedRouteClassList); - final RouteClassGenerator radioGenerator = new RouteClassGenerator(packagePrefix + ".radio", codeModel); - final RouterGenerator radioRouterGenerator = new RouterGenerator(radioRouter, radioGenerator, JMod.PUBLIC); - radioRouterGenerator.build(radioRouteClassList); - - JMethod radioMethod = router.method(JMod.PUBLIC | JMod.STATIC, radioRouter, "radio"); - radioMethod.body().directStatement("return new " + radioRouter.name() + "();"); - try { File dest = new File(argv[0]); diff --git a/graylog2-server/src/main/java/org/graylog2/cluster/Node.java b/graylog2-server/src/main/java/org/graylog2/cluster/Node.java index 03bd308c28a9..f65b155f4809 100644 --- a/graylog2-server/src/main/java/org/graylog2/cluster/Node.java +++ b/graylog2-server/src/main/java/org/graylog2/cluster/Node.java @@ -19,25 +19,9 @@ import org.graylog2.plugin.database.Persisted; import org.joda.time.DateTime; -import java.util.Locale; - -/** - * @author Dennis Oelkers - */ public interface Node extends Persisted { - public enum Type { - SERVER, - RADIO; - - public static Type fromString(String from) { - if (from.toLowerCase(Locale.ENGLISH).equals("server")) - return SERVER; - - if (from.toLowerCase(Locale.ENGLISH).equals("radio")) - return RADIO; - - return null; - } + enum Type { + SERVER, RADIO } String getNodeId(); diff --git a/graylog2-server/src/main/java/org/graylog2/cluster/NodeService.java b/graylog2-server/src/main/java/org/graylog2/cluster/NodeService.java index 7a2da1e46d15..9f4c288bec1e 100644 --- a/graylog2-server/src/main/java/org/graylog2/cluster/NodeService.java +++ b/graylog2-server/src/main/java/org/graylog2/cluster/NodeService.java @@ -22,15 +22,11 @@ import java.net.URI; import java.util.Map; -/** - * @author Dennis Oelkers - */ public interface NodeService extends PersistedService { String registerServer(String nodeId, boolean isMaster, URI restTransportUri); - String registerRadio(String nodeId, String restTransportUri); - Node byNodeId(String nodeId) throws NodeNotFoundException; + Node byNodeId(NodeId nodeId) throws NodeNotFoundException; Map allActive(Node.Type type); diff --git a/graylog2-server/src/main/java/org/graylog2/cluster/NodeServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/cluster/NodeServiceImpl.java index 01d8a744d257..597b6fa2d11d 100644 --- a/graylog2-server/src/main/java/org/graylog2/cluster/NodeServiceImpl.java +++ b/graylog2-server/src/main/java/org/graylog2/cluster/NodeServiceImpl.java @@ -17,17 +17,17 @@ package org.graylog2.cluster; import com.google.common.collect.Maps; -import javax.inject.Inject; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import org.bson.types.ObjectId; import org.graylog2.Configuration; import org.graylog2.database.MongoConnection; import org.graylog2.database.PersistedServiceImpl; -import org.graylog2.plugin.database.ValidationException; import org.graylog2.plugin.Tools; +import org.graylog2.plugin.database.ValidationException; import org.graylog2.plugin.system.NodeId; +import javax.inject.Inject; import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -57,21 +57,6 @@ public String registerServer(String nodeId, boolean isMaster, URI restTransportU } } - @Override - public String registerRadio(String nodeId, String restTransportUri) { - Map fields = Maps.newHashMap(); - fields.put("last_seen", Tools.getUTCTimestamp()); - fields.put("node_id", nodeId); - fields.put("type", Node.Type.RADIO.toString()); - fields.put("transport_address", restTransportUri); - - try { - return save(new NodeImpl(fields)); - } catch (ValidationException e) { - throw new RuntimeException("Validation failed.", e); - } - } - @Override public Node byNodeId(String nodeId) throws NodeNotFoundException { DBObject query = new BasicDBObject("node_id", nodeId); diff --git a/graylog2-server/src/main/java/org/graylog2/inputs/InputService.java b/graylog2-server/src/main/java/org/graylog2/inputs/InputService.java index 7eb4affa4059..48be98ead0c9 100644 --- a/graylog2-server/src/main/java/org/graylog2/inputs/InputService.java +++ b/graylog2-server/src/main/java/org/graylog2/inputs/InputService.java @@ -16,7 +16,6 @@ */ package org.graylog2.inputs; -import org.graylog2.cluster.Node; import org.graylog2.database.NotFoundException; import org.graylog2.plugin.database.PersistedService; import org.graylog2.plugin.database.ValidationException; @@ -30,8 +29,6 @@ public interface InputService extends PersistedService { List allOfThisNode(String nodeId); - List allOfRadio(Node radio); - Input create(String id, Map fields); Input create(Map fields); @@ -40,12 +37,8 @@ public interface InputService extends PersistedService { Input findForThisNode(String nodeId, String id) throws NotFoundException; - Input findForThisRadio(String radioId, String id) throws NotFoundException; - Input findForThisNodeOrGlobal(String nodeId, String id) throws NotFoundException; - Input findForThisRadioOrGlobal(String radioId, String id) throws NotFoundException; - /** * @return the total number of inputs in the cluster (including global inputs). */ diff --git a/graylog2-server/src/main/java/org/graylog2/inputs/InputServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/inputs/InputServiceImpl.java index 11bd3927391d..0e028e710ae9 100644 --- a/graylog2-server/src/main/java/org/graylog2/inputs/InputServiceImpl.java +++ b/graylog2-server/src/main/java/org/graylog2/inputs/InputServiceImpl.java @@ -26,9 +26,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBCursor; import com.mongodb.DBObject; -import com.mongodb.QueryBuilder; import org.bson.types.ObjectId; -import org.graylog2.cluster.Node; import org.graylog2.database.MongoConnection; import org.graylog2.database.NotFoundException; import org.graylog2.database.PersistedServiceImpl; @@ -46,7 +44,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -83,21 +80,6 @@ public List allOfThisNode(final String nodeId) { return inputs.build(); } - @Override - public List allOfRadio(Node radio) { - final List query = ImmutableList.of( - new BasicDBObject(MessageInput.FIELD_RADIO_ID, radio.getNodeId()), - new BasicDBObject(MessageInput.FIELD_NODE_ID, radio.getNodeId()), - new BasicDBObject(MessageInput.FIELD_GLOBAL, true)); - - final ImmutableList.Builder inputs = ImmutableList.builder(); - for (DBObject o : query(InputImpl.class, new BasicDBObject("$or", query))) { - inputs.add(new InputImpl((ObjectId) o.get("_id"), o.toMap())); - } - - return inputs.build(); - } - @Override public Input create(String id, Map fields) { return new InputImpl(new ObjectId(id), fields); @@ -131,25 +113,6 @@ public Input findForThisNodeOrGlobal(String nodeId, String id) throws NotFoundEx return new InputImpl((ObjectId) o.get("_id"), o.toMap()); } - @Override - public Input findForThisRadioOrGlobal(final String radioId, String id) throws NotFoundException { - final List radioIdOrGlobal = ImmutableList.of( - new BasicDBObject(MessageInput.FIELD_RADIO_ID, radioId), - new BasicDBObject(MessageInput.FIELD_NODE_ID, radioId), - new BasicDBObject(MessageInput.FIELD_GLOBAL, true)); - - final List query = ImmutableList.of( - new BasicDBObject("_id", new ObjectId(id)), - new BasicDBObject("$or", radioIdOrGlobal)); - - final DBObject o = findOne(InputImpl.class, new BasicDBObject("$and", query)); - if (o == null) { - throw new NotFoundException(); - } else { - return new InputImpl((ObjectId) o.get("_id"), o.toMap()); - } - } - @Override public Input findForThisNode(String nodeId, String id) throws NotFoundException, IllegalArgumentException { final List forThisNode = ImmutableList.of( @@ -168,26 +131,6 @@ public Input findForThisNode(String nodeId, String id) throws NotFoundException, } } - @Override - public Input findForThisRadio(String radioId, String id) throws NotFoundException { - final List list = new ArrayList() {{ - add(false); - add(null); - }}; - - final List query = ImmutableList.of( - new BasicDBObject("_id", new ObjectId(id)), - new BasicDBObject(MessageInput.FIELD_RADIO_ID, radioId), - QueryBuilder.start(MessageInput.FIELD_GLOBAL).in(list).get()); - - final DBObject o = findOne(InputImpl.class, new BasicDBObject("$and", query)); - if (o == null) { - throw new NotFoundException(); - } else { - return new InputImpl((ObjectId) o.get("_id"), o.toMap()); - } - } - @Override public void addExtractor(Input input, Extractor extractor) throws ValidationException { embed(input, InputImpl.EMBEDDED_EXTRACTORS, extractor); @@ -380,9 +323,7 @@ public Map totalCountByType() { @Override public long localCountForNode(String nodeId) { - final List forThisNode = ImmutableList.of( - new BasicDBObject(MessageInput.FIELD_NODE_ID, nodeId), - new BasicDBObject(MessageInput.FIELD_RADIO_ID, nodeId)); + final List forThisNode = ImmutableList.of(new BasicDBObject(MessageInput.FIELD_NODE_ID, nodeId)); final List query = ImmutableList.of( new BasicDBObject(MessageInput.FIELD_GLOBAL, false), @@ -395,8 +336,7 @@ public long localCountForNode(String nodeId) { public long totalCountForNode(String nodeId) { final List query = ImmutableList.of( new BasicDBObject(MessageInput.FIELD_GLOBAL, true), - new BasicDBObject(MessageInput.FIELD_NODE_ID, nodeId), - new BasicDBObject(MessageInput.FIELD_RADIO_ID, nodeId)); + new BasicDBObject(MessageInput.FIELD_NODE_ID, nodeId)); return count(InputImpl.class, new BasicDBObject("$or", query)); } diff --git a/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemResource.java b/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemResource.java index 7474c46b9f20..00033b5b2d0c 100644 --- a/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemResource.java +++ b/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemResource.java @@ -62,13 +62,7 @@ public SystemResource(ServerStatus serverStatus) { public SystemOverviewResponse system() { checkPermission(RestPermissions.SYSTEM_READ, serverStatus.getNodeId().toString()); - final String facility; - if (serverStatus.hasCapability(ServerStatus.Capability.RADIO)) - facility = "graylog2-radio"; - else - facility = "graylog2-server"; - - return SystemOverviewResponse.create(facility, + return SystemOverviewResponse.create("graylog2-server", ServerVersion.CODENAME, serverStatus.getNodeId().toString(), ServerVersion.VERSION.toString(),