Skip to content
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

Added Portainer Agent #123

Open
wants to merge 103 commits into
base: master
Choose a base branch
from
Open

Added Portainer Agent #123

Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
a8d02a2
Added Portainer Agent
Willem-Dekker Jan 2, 2020
48b67d9
Update directoryfix.sh
kauffman-repo Jan 9, 2020
09351d6
Update directoryfix.sh
kauffman-repo Jan 9, 2020
a39d01c
Adds a Gitea container to IOTstack
Paraphraser Jan 12, 2020
eb9b982
Added filter.acl file to mosquitto/config
Tomasmerca Jan 15, 2020
c4adb55
Created empty file whit example filter
Tomasmerca Jan 15, 2020
89f4647
Added options for password and filter config
Tomasmerca Jan 15, 2020
72e6345
Update menu.sh
RavHilton Feb 6, 2020
818063f
adding deconz docker compose setup
DIYtechie Feb 28, 2020
6461ed1
deconz added to menu
DIYtechie Feb 28, 2020
413c0ae
Update service.yml
DIYtechie Mar 2, 2020
050fdb1
deconz added
DIYtechie Mar 2, 2020
614e56e
added node-red-contrib-deconz
DIYtechie Mar 2, 2020
cb3e1b0
added transmission container
gpongelli Mar 22, 2020
7751ed0
add volumes management from template
gpongelli Mar 22, 2020
da5a549
update menu.sh
peyanski Apr 4, 2020
d5b991b
small update to container name
Willem-Dekker Apr 19, 2020
b068114
first import
Willem-Dekker Apr 19, 2020
d4a9cd1
Merge pull request #1 from Willem-Dekker/mkdocks
Willem-Dekker Apr 19, 2020
f6571ae
added index.md
Willem-Dekker Apr 19, 2020
55542d4
added index.md (#2)
Willem-Dekker Apr 19, 2020
96454c9
Updated styling of existing pages
Willem-Dekker Apr 19, 2020
171283a
Merge pull request #3 from Willem-Dekker/mkdocks
Willem-Dekker Apr 19, 2020
7bf68e7
Updated styling of existing pages
Willem-Dekker Apr 19, 2020
1646a7a
Merge pull request #20 from Willem-Dekker/mkdocks
SensorsIot Apr 19, 2020
a9afc96
Update README.md
SensorsIot Apr 19, 2020
50cbf52
Update README.md
SensorsIot Apr 19, 2020
0b2385b
Merge pull request #16 from SensorsIot/pr/161
Willem-Dekker Apr 19, 2020
5d0c85a
Changed each menu item to be on a separate line to make merges easier.
Apr 19, 2020
4f8a47d
Merge branch 'armhf_keys_menu_lines' into pr/126
Apr 20, 2020
52ddbcb
Changed docker-compose yml file version to 3.6.
Apr 20, 2020
d464d0f
Merge pull request #26 from SensorsIot/armhf_keys_menu_lines
Willem-Dekker Apr 20, 2020
65e48e0
Merge pull request #7 from SensorsIot/pr/139
Willem-Dekker Apr 20, 2020
67e0056
Merge pull request #3 from SensorsIot/pr/126
Willem-Dekker Apr 20, 2020
15d840b
Update README.md
Slyke Apr 20, 2020
a3078f2
Merge pull request #27 from SensorsIot/readme-update
Willem-Dekker Apr 20, 2020
d86a5cd
Merge pull request #4 from SensorsIot/pr/130
Willem-Dekker Apr 20, 2020
a7d37c0
Fixes some inconsistencies and makes other tweaks to index page
Paraphraser Apr 21, 2020
e82dac8
Fixed typo in readme (PRi --> RPi)
Apr 21, 2020
7889207
Added docker version check
Apr 21, 2020
93b10ad
Merge pull request #31 from Paraphraser/20200421-doco-index
Willem-Dekker Apr 21, 2020
3e3b8fe
Merge pull request #32 from SensorsIot/docker-version-check
Slyke Apr 21, 2020
fec3260
Merge pull request #8 from SensorsIot/pr/143
Slyke Apr 21, 2020
c133968
Merge pull request #10 from SensorsIot/pr/151
Slyke Apr 21, 2020
c23d787
Merge pull request #17 from SensorsIot/pr/169
Slyke Apr 21, 2020
dc1c366
Merge branch 'master' into PR_add_volumes_to_script
gpongelli Apr 21, 2020
47fde77
Update README.md
Slyke Apr 22, 2020
b36b7b3
Added a check to see if docker is installed before attempting to get …
Apr 22, 2020
e95298f
Removed bookmark from transmission volumes.yml
gpongelli Apr 22, 2020
1936989
Create default directories on build
Apr 25, 2020
7689228
Merge pull request #23 from gpongelli/PR_add_volumes_to_script
Slyke Apr 25, 2020
4976473
Added requirements.txt for Python 3
Apr 25, 2020
694778f
Added YAML merging Python script, with menu script modifications. Add…
Apr 26, 2020
18010cd
Removed testing override file and useless comment
Apr 26, 2020
186c2c0
Added loader option to avoid errors on some systems
Apr 26, 2020
ba686ad
added timescaledb
gpongelli Apr 26, 2020
1ce3b57
Add timescaledb in menu.sh
gpongelli Apr 26, 2020
78ae80f
Added in Python, pip and PyYaml version checking
Apr 27, 2020
038be7d
Added simplified version checking. Added whiptail for docker version
Apr 27, 2020
35bf6a3
Added better version messaging for python and deps
Apr 27, 2020
f75df7a
Merge pull request #39 from gpongelli/PR_add_timescaledb
Slyke Apr 27, 2020
0dc9c53
Merge remote-tracking branch 'origin/fix-python-requirements.txt' int…
Apr 28, 2020
0a490e7
Merge branch 'check_docker_b4_version' into experimental
Apr 28, 2020
eccff23
Merge remote-tracking branch 'origin/migration-readme' into experimental
Apr 28, 2020
53d715e
Updated readme with instructions on how to select experimental features
Apr 28, 2020
bcb42c3
Fixed merge conflict issue
Apr 28, 2020
0b30604
Added some more nodered modules. Removed override file. Added branch …
Apr 28, 2020
c6390f3
Merge branch 'master' into patch-1
DIYtechie May 3, 2020
18bdefe
port changes and devices commented
DIYtechie May 3, 2020
f3be535
devices commented out
DIYtechie May 3, 2020
07837f7
Merge pull request #24 from DIYtechie/patch-1
Slyke May 3, 2020
1a0c310
Create deconz.md
DIYtechie May 5, 2020
fc30dee
Update deconz.md
DIYtechie May 6, 2020
c3f39e8
Update deconz.md
DIYtechie May 6, 2020
609c6c9
:pencil2: fixing typo
lepirlouit May 7, 2020
ab1d590
Merge pull request #43 from DIYtechie/patch-2
Slyke May 7, 2020
153543e
Merge pull request #45 from lepirlouit/patch-1
Slyke May 7, 2020
8cbdba6
Update deconz.md
DIYtechie May 9, 2020
c584129
make empty
DIYtechie May 9, 2020
b80b21e
create deCONZ device config
DIYtechie May 9, 2020
9fc4d67
Create service_conbee.yml
DIYtechie May 9, 2020
c2d231c
Create service_conbee_II.yml
DIYtechie May 9, 2020
d09497e
Create service_raspbee.yml
DIYtechie May 9, 2020
a483b43
fixing typos and simplifying with gif
DIYtechie May 9, 2020
9fadb35
Add Dozzle container.
robertcsakany May 10, 2020
e102a7e
Fixing tablulator
robertcsakany May 10, 2020
bbb5766
Merge pull request #48 from DIYtechie/deconz
Slyke May 10, 2020
ae04776
Expansion of Grafana documentation page.
Paraphraser May 16, 2020
d3d676b
Merge pull request #53 from Paraphraser/20200515-doco-grafana
Slyke May 16, 2020
45af02c
Merge pull request #49 from robertcsakany/feature/AddDozzleContainer
Slyke May 16, 2020
0b71c43
Removes pin of Grafana to version 6.3.6.
Paraphraser May 18, 2020
993e358
Merge pull request #54 from Paraphraser/20200518-template-grafana
Slyke May 18, 2020
64f755f
Added troubleshooting text and other amendments
DIYtechie May 21, 2020
d39ae55
Update deconz.md
DIYtechie May 21, 2020
f4ad7b9
Update deconz.md
DIYtechie May 21, 2020
ebe29db
Update deconz.md
DIYtechie May 21, 2020
1cc95db
Clean up
DIYtechie May 21, 2020
576c88f
Merge pull request #57 from DIYtechie/deconz
Slyke May 21, 2020
78d90b6
Merge pull request #40 from SensorsIot/experimental
Slyke May 29, 2020
01eb79a
Fixed bug where yaml merging was overwriting deconz services
May 29, 2020
1b6ea53
Merge pull request #62 from SensorsIot/deconz-fix
Slyke May 31, 2020
4324578
Merge branch 'master' into Portainer-agent
Willem-Dekker Jun 15, 2020
2955f36
Merge remote-tracking branch 'SensorsIot/master' into Portainer-agent
Willem-Dekker Jun 15, 2020
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
Prev Previous commit
Next Next commit
Update deconz.md
  • Loading branch information
@DIYtechie
DIYtechie authored May 21, 2020
commit ebe29dbbfcea42181867004abf98d831fd971480
1 change: 1 addition & 0 deletions docs/deconz.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ Step 1: In the Phoscon UI, Go to Settings > Gateway > Advanced and click "Authen

Step 2: In Node-RED, open a deCONZ node, select "Add new deonz-server", insert your ip adress and port 8090 and click "Get settings". Click "Add", "Done" and "Deploy". Your device list will not be updated before deploying.


![installing deCONZ](https://github.com/DIYtechie/resources/blob/master/images/Setup%20deCONZ%20in%20Node-RED.gif?raw=true)