OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-04 22:17:59 +08:00
Code Issues Projects Releases Wiki Activity
383 Commits 1 Branch 0 Tags
Commit Graph

383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jovan Kostovski
7fe8100d6b replaced glide with dep dependency manager 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-14 18:28:42 +01:00
Drasko DRASKOVIC
6d9c92596c
Merge pull request #158 from bblagojevic94/mainflux-157 
Export normalize method from writer service inside cassandra package
 2018-02-10 17:50:18 +01:00
Bojan Blagojevic
3ac88b05a8 Export normalize method from writer service inside cassandra package 
Signed-off-by: Bojan Blagojevic <datiglavaradi@gmail.com>
 2018-02-10 15:45:53 +01:00
Drasko DRASKOVIC
f84958834e
Merge pull request #148 from chombium/mainflux-147 
Various bin script fixes
 2018-02-06 10:44:02 +01:00
Jovan Kostovski
7723b92ba7 added the CoAP server 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>

Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 02:14:22 +01:00
Jovan Kostovski
3072d054ee added back the coap service 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>

Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 02:13:22 +01:00
Jovan Kostovski
b4a51ae0a2 reverted the removal of the coap service 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
f277074d42 added desc. of the Cassandra create keyspaces cmd 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
2f1b999727 removed the cleaning 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
ce86fbbe90 added desc. how to create the Cassandra keyspaces 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>

In the README.md it is written that the install script will guide the user how to setup the infrastructure
for running Mainflux, but there was a missing description on which Cassandra keyspacess are needed and how to create them.
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
615ba9267d clean up before/after compile and installation 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
10113bd354 fixed the link to the contribution guide 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
c691ee06f0 show help and exit if no argument is provided 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>

bugfix for the case where the script was started without an argument.
The help was printed, but the _mainflux_docker was called as well, which
was causing the following error:
./mainflux-docker.sh: line 163: $1: unbound variable
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
23a3a5f194 added a .gitignore file 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>

Added a .gitignore file with the build folder in it, so that
if someone bulds Mainflux localy the build folder does not end
up in the repo.
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
6f202a9f83 #105 removed the Coap service from the build 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Jovan Kostovski
74f890128d fixed a typo 
Signed-off-by: Jovan Kostovski <chombium@gmail.com>
 2018-02-06 01:48:38 +01:00
Nikola Marčetić
6099da59e6
Merge pull request #154 from mainflux/docker-clean 
Add `clean` function to docker-compose script
 2018-02-05 10:47:31 +01:00
Drasko DRASKOVIC
0255a4cd61 Add clean function to docker-compose script 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2018-02-05 02:33:51 +01:00
Drasko DRASKOVIC
411cbf575a
Merge pull request #146 from mainflux/issue-145 
Fix 403 errors handling
 2018-01-26 20:56:05 +01:00
Dejan Mijic
5d715aa984
Fix 403 errors handling 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2018-01-26 20:50:31 +01:00
Drasko DRASKOVIC
30f7dda491
Merge pull request #144 from kelvinji2009/master 
fix external_link dependency for http adaptor service
 2018-01-18 17:45:27 +01:00
kelvinji
ff5d77722c fix external_link dependency for http adaptor service 
Signed-off-by: kelvinji <kelvinji2009@gmail.com>
 2018-01-14 18:40:20 +08:00
Dejan Mijic
b6eac477b4
Fix code linting 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2018-01-13 18:25:58 +01:00
Dejan Mijić
7cc03be424
Close response body properly (#143) 2018-01-13 18:15:41 +01:00
Drasko DRASKOVIC
4f467dcdde Add HTTP auth check (#128) 
* Add HTTP auth check

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>

* Add HTTP auth via Manager Client

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>

* Change the way manager client is injected

Instead of relying on modifying service structure, manager client is
injected through handler factory method, and store as a variable in that
module.

Signed-off-by: Dejan Mijic <dejan@mainflux.com>

* Update dockerignore

Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2018-01-07 14:42:38 +01:00
Drasko DRASKOVIC
d413508b25 Fix #116: remove base values from C* tables (#140) 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2018-01-06 22:36:44 +01:00
Drasko DRASKOVIC
8036c74207
Merge pull request #138 from mainflux/mainflux-137 
Remove redundant endpoints from manager
 2018-01-05 09:11:10 +01:00
Dejan Mijic
3b57ebf532
Fix manager client implementation 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 11:10:31 +01:00
Dejan Mijic
15e9745517
Fix middleware method signature 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 10:56:59 +01:00
Dejan Mijic
f30c9725aa
Move contributing guide to .github folder 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 10:49:03 +01:00
Dejan Mijic
4c97094427
Update the API handlers 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 10:47:43 +01:00
Dejan Mijic
253a7afcf7
Implement access check based on the API spec 
Instead of returning boolean value whether or not the access is granted,
an identifier bound to the provided access key is returned.

Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 10:40:44 +01:00
Dejan Mijic
52ab91c275
Update the API documentation of manager service 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-29 10:22:37 +01:00
oldmikeyang
5899177f57 change the order of message table and remove the time to live (#132) 2017-12-23 22:03:04 +01:00
Drasko DRASKOVIC
3e11147ab5
Merge pull request #131 from bzub/130-docker-script-fix 
Search for "mainflux-nginx" instead of "nginx"
 2017-12-18 14:49:53 +01:00
bzub
c57c9f0a3c Search for "mainflux-nginx" instead of "nginx" 
Fixes #130 where the script sees non mainflux-nginx container(s) and
assumes mainflux-nginx is already pulled/created.

Signed-off-by: bzub <bzubrod@gmail.com>
 2017-12-16 17:02:10 -06:00
Drasko DRASKOVIC
b6b997237e
Merge pull request #129 from mainflux/feature-manager-client 
Authentication client
 2017-12-12 11:57:16 +01:00
Dejan Mijic
c11cf5820c
Add circuit breaker toward the manager service 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-12 11:20:57 +01:00
Dejan Mijic
28bff54ea6
Add authentication client 
Implemented a HTTP client toward the manager service. The client is
intended to be used as a library that will generate requests to the
'/identity' endpoint of a manager service instance selected through
provided URL.

Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-11 15:22:42 +01:00
Dejan Mijic
00117519c4
Update HTTP adapter's configuration docs 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-12-11 14:18:42 +01:00
Drasko DRASKOVIC
238394e0a7
Merge pull request #125 from manuIO/master 
Fix README
 2017-11-23 18:03:56 +01:00
Manuel IMPERIALE
7eb12015c0 Fix README 
Signed-off-by: Manuel IMPERIALE <manuel.imperiale@gmail.com>
 2017-11-22 12:51:32 +01:00
Dejan Mijić
46a7341eba Merge pull request #121 from mainflux/revert-120-mainflux-83 
Revert "Consul integration"
 2017-10-16 11:28:12 +02:00
Dejan Mijić
b651537ba9 Revert "Consul integration" 2017-10-16 11:27:11 +02:00
Drasko DRASKOVIC
b9e1c0da81 Merge pull request #120 from mainflux/mainflux-83 
Consul integration
 2017-10-15 20:05:03 +02:00
Dejan Mijic
3466776152
Register CoAP adapter to Consul 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-10-15 18:19:23 +02:00
Dejan Mijic
3f9f56d0d4 Register http adapter to consul 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-10-15 18:08:01 +02:00
Dejan Mijic
2e5316e3fd
Register writer to consul 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-10-15 18:07:52 +02:00
Dejan Mijic
9c429d142d
Register manager to Consul 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-10-15 15:25:55 +02:00
Dejan Mijic
11eed2aa2c
Format the startup logs 
Signed-off-by: Dejan Mijic <dejan@mainflux.com>
 2017-10-15 14:05:05 +02:00