Skip to content

Merge MONROE changes back into master, fixes #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 49 commits into from
Jun 14, 2017
Merged

Merge MONROE changes back into master, fixes #32

merged 49 commits into from
Jun 14, 2017

Conversation

@relet
Copy link
Contributor

@relet relet commented Jun 12, 2017

if project:1 is set

  • supports MONROE extra field InternalInterface
  • overwrites timestamps with a double (yes, that's a consortium thing)
  • splits GPS messages by topic into GPS.GPGGA and GPS.GPRMC

globally:

  • fixes typo(?) reselet -> reselect
  • changes the munin polling interval 5->60 to avoid ZMQ message bursts
  • uses add_default_fields for all message types

relet and others added 30 commits February 25, 2016 13:13
@relet
Merge pull request #1 from kristrev/master
e29f93d 
bump data-exporter from kristrev/master
@relet
Merge pull request #2 from relet/config-file
e2b86f6 
Config file support (parameter -c)
@relet
Merge pull request #3 from kristrev/master
942d3b8 
bump data-exporter from kristrev/master
@relet
some simplification of ZMQ output fields
787fed1
@relet
Merge branch 'master' of https://github.com/kristrev/data-exporter
e66be0c
@relet
revert DataId for sensor messages, they are joined into a common table
e9fb223
@relet
rm double definition of KEY_SIGNAL
79462b2
@relet
send NaN values as null in GPS speed
9951fad
@relet
Merge branch 'master' of https://github.com/MONROE-PROJECT/data-exporter
a41ca63 
; branch 'master' of https://github.com/kristrev/data-exporter
@relet
retry zmq connection if interface is not available
d9b325a
@relet
simplify zmq_send code
6f3481d
@relet
Merge branch 'master' of https://github.com/kristrev/data-exporter
d9439b3
@relet
add InternalInterface key to zmq export, using a static mapping from …
71f08a0 
…OperatorName
@relet
Merge branch 'master' of https://github.com/kristrev/data-exporter
d1876bd
@relet
skip wwan0 in mapping
0012665
@relet
add TelenorS to operator table
dc00db0
@relet
merge from kristrev/master
a2fc983
@relet
add Movistar
563ce65
@relet
typo
af1ed70
@relet
add Weblink
dcaf22e
@relet
refactoring, log message when dropping messages
ad2f78a
@relet
reduce munin message interval
e253e82
@relet
add voda ES to the operator list
1ba47e3
@relet
add NITOS isp as op0
7298a83
@relet
Merge branch 'master' of https://github.com/kristrev/data-exporter
17753b8
@relet
+SWE to provider list
ef3043b
add C-OTE
2e587be
map by imei, not operayor
2b5efb9
implement map_imei
fb0611a
rm debug message
637b2aa
@kristrev kristrev merged commit 720bfc1 into kristrev:master Jun 14, 2017
@relet relet deleted the merge-kristrev-master branch June 21, 2017 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@relet @kristrev