Skip to content
This repository has been archived by the owner on Feb 6, 2019. It is now read-only.

Consolidates Docker properties files #6

Merged
merged 1 commit into from
Sep 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-files/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apk --update add openjdk8-jre

# environment variables
ENV APP_DIR=/edgex/edgex-device-snmp
ENV APP=fuse-device-snmp.jar
ENV APP=device-snmp.jar
ENV APP_PORT=49989

#copy JAR and property files to the image
Expand Down
35 changes: 34 additions & 1 deletion docker-files/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ server.port=49989

#default device service settings
service.name=edgex-device-snmp
service.host=edgex-device-snmp
#service.host=localhost
service.host=${service.name}
service.labels=SNMP,scheduler
service.callback=/api/v1/callback

Expand All @@ -47,3 +48,35 @@ spring.mvc.dispatch-options-request=true

data.transform=true

meta.db.addressable.url=http://edgex-core-metadata:48081/api/v1/addressable
meta.db.deviceservice.url=http://edgex-core-metadata:48081/api/v1/deviceservice
meta.db.deviceprofile.url=http://edgex-core-metadata:48081/api/v1/deviceprofile
meta.db.device.url=http://edgex-core-metadata:48081/api/v1/device
meta.db.devicemanager.url=http://edgex-core-metadata:48081/api/v1/devicemanager
meta.db.devicereport.url=http://edgex-core-metadata:48081/api/v1/devicereport
meta.db.command.url=http://edgex-core-metadata:48081/api/v1/command
meta.db.event.url=http://edgex-core-metadata:48081/api/v1/scheduleevent
meta.db.schedule.url=http://edgex-core-metadata:48081/api/v1/schedule
meta.db.provisionwatcher.url=http://edgex-core-metadata:48081/api/v1/provisionwatcher
meta.db.ping.url=http://edgex-core-metadata:48081/api/v1/ping

core.db.event.url=http://edgex-core-data:48080/api/v1/event
core.db.reading.url=http://edgex-core-data:48080/api/v1/reading
core.db.valuedescriptor.url=http://edgex-core-data:48080/api/v1/valuedescriptor
core.db.ping.url=http://edgex-core-data:48080/api/v1/ping

logging.remote.enable=true
logging.remote.url=http://edgex-support-logging:48061/api/v1/logs

schedule.interval=500

default.schedule.name=Interval-1m
default.schedule.frequency=PT1m

default.scheduleEvent.name=Read-AllData-edgex-device-snmp
default.scheduleEvent.path=/api/v1/device/all/AllLightStates
default.scheduleEvent.service=edgex-device-snmp
default.scheduleEvent.schedule=Interval-1m
snmp.version=1
snmp.retries=2
snmp.timeout=2000
43 changes: 0 additions & 43 deletions docker-files/rest-endpoint.properties

This file was deleted.

31 changes: 0 additions & 31 deletions docker-files/schedule.properties

This file was deleted.

22 changes: 0 additions & 22 deletions docker-files/snmp.properties

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ heart.beat.time=300000
server.port=49989

#default device service settings
service.name=edgex-device-snmp
service.name=device-snmp
service.host=localhost
#service.host=edgex-device-snmp
#service.host=${service.name}
service.labels=SNMP,scheduler
service.callback=/api/v1/callback

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/schedule.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ schedule.interval=500
default.schedule.name=Interval-1m
default.schedule.frequency=PT1m

default.scheduleEvent.name=Read-AllData-edgex-device-snmp
default.scheduleEvent.name=Read-AllData-device-snmp
default.scheduleEvent.path=/api/v1/device/all/AllLightStates
default.scheduleEvent.service=edgex-device-snmp
default.scheduleEvent.service=device-snmp
default.scheduleEvent.schedule=Interval-1m