Commit graph

102 commits

Author SHA1 Message Date
Samuel Clay
e1ad3bcad1 Merge branch 'master' into pro
* master:
  www -> haproxy group
  Rearranging mongo servers
2022-03-15 17:19:11 -04:00
Samuel Clay
8c56c6f98e www -> haproxy group 2022-03-15 17:19:01 -04:00
Samuel Clay
f33cbcf312 Merge branch 'master' into pro
* master: (72 commits)
  Missing import
  Correctly decoding shared stories in RSS feed.
  Adding scroll to feed and story options popover (Style menu).
  Magazine view blog post.
  Refactoring story content preview with newlines preserved.
  Boosting db profiling from 1% to 5%.
  Ignore data uris for widget, they are never the big images
  Wait to strip data uri header until it's time.
  Moving encoding
  Don't double encode base64 images for widgets.
  Preserving paragraphs in magazine and grid views.
  Fixing bad instrumentation on mongo and redis logs.
  Wrong url for db profiler.
  Let's try showing only single feeds in the DB profiler to see if it's better at showing abnormalities with less noise.
  Fixing strict bug where  wasn't defined.
  Showing grid image previews. Not sure how this ever worked before.
  Grid has image if found already.
  Showing grid image on load if youtube
  Only monitor river_stories for db times
  Not hitting a db shouldnt be colored any differently than a small value.
  ...
2022-03-09 11:41:40 -05:00
Samuel Clay
13533f84b7 Removing broken CSS. 2022-02-24 10:41:20 -05:00
Samuel Clay
01ad0e8656 Paypal refunds are now working. Need to add partial balances when upgrading tiers on paypal. Eventually need to think about refunds for switching providers. 2022-02-10 13:40:07 -05:00
Samuel Clay
a1517b6266 Adding paypal sub id and paypalrestsdk library. Paypal has what it needs, now to hook up the API which is still unauthorized. 2022-02-08 12:49:40 -05:00
Samuel Clay
02cb4cf2b4 Cleaning up docker compose 2022-01-26 13:35:06 -05:00
Samuel Clay
18aeafffa2 Cleaning up docker compose 2022-01-26 13:33:59 -05:00
Samuel Clay
97fc9a4f29 Adding makefile command for stripe testing commands 2022-01-25 15:47:01 -05:00
Samuel Clay
71b9b2f3d8 Paypal/stripe return needs user profile for JS. 2022-01-25 10:26:45 -05:00
Samuel Clay
2554984717 Merge branch 'pipeline' into pro
* pipeline:
  Installing Java in deploy image to get closure compiler working. Also updating closure binary path.
  Ensuring dependencies met for deployment on local.
  Updating to docker buildx for multi-arch builds (amd64 + arm64)
2022-01-19 13:01:38 -05:00
Samuel Clay
0f27ba81e0 Updating to docker buildx for multi-arch builds (amd64 + arm64) 2022-01-18 17:25:07 -05:00
Samuel Clay
2792e7305a Syncing redis on premium upgrade to sync new unread date possibilities for archive users. 2022-01-13 16:56:30 -05:00
Samuel Clay
f615fccdad Coutning archive and pro premiums correctly. 2022-01-11 15:56:19 -05:00
Samuel Clay
04c62b11c7 Cleaning up static assets. Needs to run on first make nb or DEBUG_ASSETS needs to always be set to True. 2022-01-04 15:54:37 -05:00
Samuel Clay
b8eccdbed4 Merge branch 'master' into pipeline
* master:
  Fixing names for state timeline, also fixing node server bootstrap.
  Moving up haproxy state timeline
  Bumping haproxy state timeline scrapes.
  Only need haproxy for haproxy metrics
  Refactored state timeline to work as a flask metrics server on haproxy. Needs ansible configs to deploy on www server.
  Forgot to save merge conflict.
  fix service state timeline key error and change scrape interval
  Revert "Revert "Merge branch 'state_timeline'""
  Revert "Merge branch 'state_timeline'"
  Fixing syntax error
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
  add grafana dashboard backup functionality
2022-01-04 14:44:57 -05:00
Samuel Clay
9ced4ccadd Merge branch 'master' into pipeline
* master: (84 commits)
  Deploying new analytics server.
  Create mongodb database user. Only runs on analytics, but should work fine on main mongo.
  Adding second mongo analytics db, cleaning up mongo analytics auth.
  Adding RSS autodiscovery to blog. Thanks https://forum.newsblur.com/t/irony-newsblur-cant-auto-extract-rss-feed-from-blog-newsblur-com/8849.
  Revert "Merge branch 'state_timeline'"
  Fixing syntax error
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  fix flask_metrics ansible role
  add state timeline dashboard to grafana
  move state timeline to one single flask that gets astate for all services
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
  Restore postgres backup. Needs work.
  Prepping postgres backup
  Prepping postgres transition, writing redis db maintenance.
  Prepping redis for moving back to primary.
  Updating redis backup to include percentage progress and access to the correct data dump.
  ...
2021-12-16 15:41:57 -05:00
Jonathan Math
6189dd4c01 add grafana dashboard backup functionality 2021-12-15 13:40:23 -05:00
Samuel Clay
ba6b4e5d1c Prepping postgres transition, writing redis db maintenance. 2021-12-13 16:09:27 -05:00
Jonathan Math
f26ae11707 add collectstatic make command and newsblur_deploy dockerfile 2021-11-16 12:41:09 -05:00
Samuel Clay
73380a2e74 Specifying docker build platform (--platform linux/amd64) so M1 Macs don't build arm64/v8. 2021-11-14 17:27:02 -05:00
Jonathan Math
402563ab41 Fix node image/ docker-compose issue
the node_modules in the image were being overwritten by the bind mount for the node scripts. I fixed this by installing node_modules into a different directory and setting that directory in an env variable in the image.
2021-10-18 11:48:43 -05:00
Jonathan Math
626245cd6b make 'make down' command include metrics containers 2021-09-21 12:11:30 -05:00
Samuel Clay
3e23b6394a Revert "Revert "Merge branch 'add_grafana_monitors'""
This reverts commit a7f5025a16.
2021-09-16 11:57:57 -05:00
Samuel Clay
a7f5025a16 Revert "Merge branch 'add_grafana_monitors'"
This reverts commit f0c2176908, reversing
changes made to 72ef2e2f00.
2021-09-07 11:36:11 -04:00
Jonathan Math
25efd6d973 merge master 2021-09-05 22:42:32 -05:00
Samuel Clay
8ceafe0465 Adding mongo repair command for local development. 2021-08-11 18:36:35 -04:00
Jonathan Math
b45fd33cdc fix makefile 2021-08-10 10:04:40 -05:00
Samuel Clay
af390d5fd1 Adding elasticsearch to py3, upgrading monitor, need to fix boto -> boto3. 2021-08-04 18:42:58 -04:00
Samuel Clay
3ca108b816 Make old inventory 2021-08-03 15:17:25 -04:00
Samuel Clay
54b9b8c100 Read in bytes when stuffing images into api bookmarklet response. 2021-08-02 16:30:12 -04:00
Samuel Clay
0d266d7569 Adding auth source to mongo auth in node. 2021-07-12 21:41:19 -04:00
Samuel Clay
ce1ec6fcd8 Adding feed font controls to manage menu. Choose between Whitney (default), Lucida Grande (old default), and Sentinel. 2021-07-07 15:49:36 -04:00
Samuel Clay
e160a86d2a Switching celery to local log driver for docker due to logs filling up disk space. 2021-06-30 00:22:09 -04:00
Jonathan Math
a851e246d5 add RUNWITHMAKEBUILD=True to Makefile commands 2021-06-29 08:42:45 -06:00
Jonathan Math
bbfb66cdd4 add RUNWITHMAKEBUILD=True to makefile docker-compose commands. add make command for looking at mongo logs 2021-06-29 08:33:30 -06:00
Samuel Clay
bca23d3850 Adding redesign blog post draft. 2021-06-28 18:13:20 -04:00
Samuel Clay
96554221cb Fixing jekyll make command. 2021-06-21 22:40:48 -04:00
Samuel Clay
7658e59792 Cleaning up footer. 2021-06-21 22:39:56 -04:00
Jonathan Math
65bcb5e9e1 change env var name 2021-06-19 09:49:28 -06:00
Jonathan Math
db1e09a822 make an error message if the makefile is not used 2021-06-19 09:37:27 -06:00
Jonathan Math
9903dcbf41 add docker-compose metrics file and update makefile 2021-05-19 10:28:16 -04:00
Samuel Clay
2f36ca57ae Cleaning up Makefile 2021-05-17 17:39:27 -04:00
Samuel Clay
52260e9d28 Renaming make build 2021-05-17 17:37:54 -04:00
Jonathan Math
ccad0de9d3 add make pull to makefile 2021-05-17 17:32:54 -04:00
Samuel Clay
9bb4b8b83e Renaming make refresh to make tfrefresh, and make generate to make inventory. 2021-05-17 12:09:16 -04:00
Samuel Clay
62a6f664e1 Maintenance mode was easier to write than I thought. 2021-05-13 19:53:34 -04:00
Samuel Clay
428647f70c Lowering readability logs. 2021-05-12 18:54:04 -04:00
Jonathan Math
85eb6a4fd5 merge recent changes 2021-05-07 09:59:35 -05:00
Samuel Clay
57d37aa833 Turning on docker DEBUG. 2021-04-29 15:21:40 -04:00