[VOL-634] Remove fluentd logging reference from voltha services
This update removes the "hardcoded" logging framework (fluentd)
from the voltha, ofagent and netconf services. The logging is
now determined at deployment time. Testing was done in kubernetes
environment and minimally in docker swarm mode environment (docker
swarm mode is not required for voltha 1.3). A separate Jira will
be raised to adjust the docker swarm deployment files, i.e. direct
the logs to fluentd/fluentd-agg listen ports instead of writing locally.
Change-Id: Ic780fc9633f0f833f961c97dc59d89eed2112a53
diff --git a/netconf/main.py b/netconf/main.py
index c0f95fc..6f096a8 100755
--- a/netconf/main.py
+++ b/netconf/main.py
@@ -46,7 +46,6 @@
client_passwords_file=os.environ.get('CLIENT_PASSWORD_FILE',
'client_passwords'),
grpc_endpoint=os.environ.get('GRPC_ENDPOINT', 'localhost:50055'),
- fluentd=os.environ.get('FLUENTD', None),
instance_id=os.environ.get('INSTANCE_ID', os.environ.get('HOSTNAME', '1')),
internal_host_address=os.environ.get('INTERNAL_HOST_ADDRESS',
get_my_primary_local_ipv4()),
@@ -130,15 +129,6 @@
default=defs['client_passwords_file'],
help=_help)
- _help = ('<hostname>:<port> to fluentd server (default: %s). (If not '
- 'specified (None), the address from the config file is used'
- % defs['fluentd'])
- parser.add_argument('-F', '--fluentd',
- dest='fluentd',
- action='store',
- default=defs['fluentd'],
- help=_help)
-
_help = ('gRPC end-point to connect to. It can either be a direct'
'definition in the form of <hostname>:<port>, or it can be an'
'indirect definition in the form of @<service-name> where'
@@ -248,8 +238,7 @@
verbosity_adjust = (args.verbose or 0) - (args.quiet or 0)
self.log = setup_logging(self.config.get('logging', {}),
args.instance_id,
- verbosity_adjust=verbosity_adjust,
- fluentd=args.fluentd)
+ verbosity_adjust=verbosity_adjust)
# components
self.nc_server = None